[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kwin
From:       Thomas Lübking <thomas.luebking () gmail ! com>
Date:       2010-12-20 18:18:27
Message-ID: 20101220181827.7D930AC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1208120 by luebking:

adjust strict geometry policies
http://svn.reviewboard.kde.org/r/5871/
BUG: 158974
CCBUG: 252314

@Jorge:
please see the request description and check whether this allows you to fix your bug
in case, don't forget to close it ;-)


 M  +6 -7      geometry.cpp  


--- trunk/KDE/kdebase/workspace/kwin/geometry.cpp #1208119:1208120
@@ -1496,12 +1496,9 @@
         w += xSizeHint.base_width;
         h += xSizeHint.base_height;
         }
-    if( !rules()->checkStrictGeometry( false ))
-        {
-        // disobey increments and aspect when maximized
-        if( maximizeMode() & MaximizeHorizontal )
+    if( !rules()->checkStrictGeometry( true ))
+        {   // disobey increments and aspect by explicit rule
             w = w1;
-        if( maximizeMode() & MaximizeVertical )
             h = h1;
         }
 
@@ -1698,6 +1695,9 @@
 
 void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, int \
gravity, bool from_tool )  {
+    if ( maximizeMode() == MaximizeFull) // bugs #158974, #252314
+        return; // "maximized" is a user setting -> we do not allow the client to \
resize itself away from this & against the user wish +
     if( gravity == 0 ) // default (nonsense) value for the argument
         gravity = xSizeHint.win_gravity;
     if( value_mask & ( CWX | CWY ))
@@ -1729,8 +1729,7 @@
         new_pos = rules()->checkPosition( new_pos );
 
         // TODO what to do with maximized windows?
-        if ( maximizeMode() != MaximizeFull
-            || ns != size())
+        if ( ns != size())
             {
             QRect orig_geometry = geometry();
             GeometryUpdatesBlocker blocker( this );


[prev in list] [next in list] [prev in thread] [next in thread]