Merge branch 'KDE/4.10'

2013-04-16 22:07:22 +02:00 · 2013-04-16 22:07:22 +02:00 · 2742f6747f
commit 2742f6747f
parent 1bda85f9f5 5d530a64fb
1 changed files with 3 additions and 2 deletions
--- a/geometry.cpp
+++ b/geometry.cpp
@ -2628,8 +2628,9 @@ void Client::finishMoveResize(bool cancel)
                                    moveResizeGeom.width() != initialMoveResizeGeom.width();
            const bool restoreV = maximizeMode() == MaximizeVertical &&
                                    moveResizeGeom.height() != initialMoveResizeGeom.height();
-            if (restoreH || restoreV) // NOT setMaximize(restoreH, restoreV); !
-                setMaximize(false, false);
+            if (restoreH || restoreV) {
+                changeMaximize(restoreV, restoreH, false);
+            }
        }
        setGeometry(moveResizeGeom);
    }