diff --git a/client.cpp b/client.cpp index 60e5aaf45e..1147864718 100644 --- a/client.cpp +++ b/client.cpp @@ -179,7 +179,6 @@ Client::Client(Workspace* ws) skip_pager = false; max_mode = MaximizeRestore; - maxmode_restore = MaximizeRestore; cmap = None; diff --git a/client.h b/client.h index 6d5270e338..b39468724a 100644 --- a/client.h +++ b/client.h @@ -356,7 +356,6 @@ public: bool isMinimized() const; bool isMaximizable() const; QRect geometryRestore() const; - MaximizeMode maximizeModeRestore() const; MaximizeMode maximizeMode() const; bool isMinimizable() const; void setMaximize(bool vertically, bool horizontally); @@ -872,7 +871,6 @@ private: MaximizeMode max_mode; QRect geom_restore; QRect geom_fs_restore; - MaximizeMode maxmode_restore; QTimer* autoRaiseTimer; QTimer* shadeHoverTimer; QTimer* delayedMoveResizeTimer; @@ -1090,11 +1088,6 @@ inline QRect Client::geometryRestore() const return geom_restore; } -inline Client::MaximizeMode Client::maximizeModeRestore() const -{ - return maxmode_restore; -} - inline Client::MaximizeMode Client::maximizeMode() const { return max_mode; diff --git a/geometry.cpp b/geometry.cpp index defe54b89d..4f9e8c373c 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -2183,18 +2183,6 @@ void Client::changeMaximize(bool vertical, bool horizontal, bool adjust) } } - // restore partial maximizations - if (old_mode == MaximizeFull && max_mode == MaximizeRestore) { - if (maximizeModeRestore() == MaximizeVertical) { - max_mode = MaximizeVertical; - maxmode_restore = MaximizeRestore; - } - if (maximizeModeRestore() == MaximizeHorizontal) { - max_mode = MaximizeHorizontal; - maxmode_restore = MaximizeRestore; - } - } - switch(max_mode) { case MaximizeVertical: { @@ -2266,12 +2254,6 @@ void Client::changeMaximize(bool vertical, bool horizontal, bool adjust) } case MaximizeFull: { - if (!adjust) { - if (old_mode & MaximizeVertical) - maxmode_restore = MaximizeVertical; - if (old_mode & MaximizeHorizontal) - maxmode_restore = MaximizeHorizontal; - } QSize adjSize = adjustedSize(clientArea.size(), SizemodeMax); QRect r = QRect(clientArea.topLeft(), adjSize); if (r.size() != clientArea.size()) { // to avoid off-by-one errors...