Merge branch 'KDE/4.10'

This commit is contained in:
Thomas Lübking 2013-04-16 22:07:22 +02:00
commit 2742f6747f

View file

@ -2628,8 +2628,9 @@ void Client::finishMoveResize(bool cancel)
moveResizeGeom.width() != initialMoveResizeGeom.width(); moveResizeGeom.width() != initialMoveResizeGeom.width();
const bool restoreV = maximizeMode() == MaximizeVertical && const bool restoreV = maximizeMode() == MaximizeVertical &&
moveResizeGeom.height() != initialMoveResizeGeom.height(); moveResizeGeom.height() != initialMoveResizeGeom.height();
if (restoreH || restoreV) // NOT setMaximize(restoreH, restoreV); ! if (restoreH || restoreV) {
setMaximize(false, false); changeMaximize(restoreV, restoreH, false);
}
} }
setGeometry(moveResizeGeom); setGeometry(moveResizeGeom);
} }