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

List:       kde-commits
Subject:    KDE/kdebase/kwin
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2005-08-17 9:34:01
Message-ID: 1124271241.674959.31279.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 449976 by lunakl:

When just adjusting maximized state e.g. because of workarea changes,
don't destroy data about restoring back.



 M  +9 -6      geometry.cpp  


--- trunk/KDE/kdebase/kwin/geometry.cpp #449975:449976
@@ -1815,12 +1815,12 @@
     QRect clientArea = workspace()->clientArea( MaximizeArea, this );
 
     // save sizes for restoring, if maximalizing
-    if( !( y() == clientArea.top() && height() == clientArea.height()))
+    if( !adjust && !( y() == clientArea.top() && height() == clientArea.height()))
         {
         geom_restore.setTop( y());
         geom_restore.setHeight( height());
         }
-    if( !( x() == clientArea.left() && width() == clientArea.width()))
+    if( !adjust && !( x() == clientArea.left() && width() == clientArea.width()))
         {
         geom_restore.setLeft( x());
         geom_restore.setWidth( width());
@@ -1932,10 +1932,13 @@
 
         case MaximizeFull:
             {
-            if( old_mode & MaximizeVertical )
-                maxmode_restore = MaximizeVertical;
-            if( old_mode & MaximizeHorizontal )
-	        maxmode_restore = MaximizeHorizontal;
+            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);
             setGeometry( r );
[prev in list] [next in list] [prev in thread] [next in thread]