yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove overzealous maxmode_restore

Browse source 
there's no point in changing the behavior of the maximize button

BUG: 195576
This commit is contained in:
Thomas Lübking 2012-03-11 06:35:24 +01:00
parent 2b2877ddb1
commit b0f5e4ac29
3 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client.cpp
View file

@ -179,7 +179,6 @@ Client::Client(Workspace* ws)
skip_pager = false; skip_pager = false;
max_mode = MaximizeRestore; max_mode = MaximizeRestore;
maxmode_restore = MaximizeRestore;
cmap = None; cmap = None;

7
client.h
View file

@ -356,7 +356,6 @@ public:
bool isMinimized() const; bool isMinimized() const;
bool isMaximizable() const; bool isMaximizable() const;
QRect geometryRestore() const; QRect geometryRestore() const;
MaximizeMode maximizeModeRestore() const;
MaximizeMode maximizeMode() const; MaximizeMode maximizeMode() const;
bool isMinimizable() const; bool isMinimizable() const;
void setMaximize(bool vertically, bool horizontally); void setMaximize(bool vertically, bool horizontally);
@ -872,7 +871,6 @@ private:
MaximizeMode max_mode; MaximizeMode max_mode;
QRect geom_restore; QRect geom_restore;
QRect geom_fs_restore; QRect geom_fs_restore;
MaximizeMode maxmode_restore;
QTimer* autoRaiseTimer; QTimer* autoRaiseTimer;
QTimer* shadeHoverTimer; QTimer* shadeHoverTimer;
QTimer* delayedMoveResizeTimer; QTimer* delayedMoveResizeTimer;
@ -1090,11 +1088,6 @@ inline QRect Client::geometryRestore() const
return geom_restore; return geom_restore;
} }
inline Client::MaximizeMode Client::maximizeModeRestore() const
{
return maxmode_restore;
}
inline Client::MaximizeMode Client::maximizeMode() const inline Client::MaximizeMode Client::maximizeMode() const
{ {
return max_mode; return max_mode;

18
geometry.cpp
View file

@ -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) { switch(max_mode) {
case MaximizeVertical: { case MaximizeVertical: {
@ -2266,12 +2254,6 @@ void Client::changeMaximize(bool vertical, bool horizontal, bool adjust)
} }
case MaximizeFull: { case MaximizeFull: {
if (!adjust) {
if (old_mode & MaximizeVertical)
maxmode_restore = MaximizeVertical;
if (old_mode & MaximizeHorizontal)
maxmode_restore = MaximizeHorizontal;
}
QSize adjSize = adjustedSize(clientArea.size(), SizemodeMax); QSize adjSize = adjustedSize(clientArea.size(), SizemodeMax);
QRect r = QRect(clientArea.topLeft(), adjSize); QRect r = QRect(clientArea.topLeft(), adjSize);
if (r.size() != clientArea.size()) { // to avoid off-by-one errors... if (r.size() != clientArea.size()) { // to avoid off-by-one errors...