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

List:       kde-commits
Subject:    kdebase/kwin
From:       Thomas Lübking <thomas.luebking () web ! de>
Date:       2005-01-28 23:28:12
Message-ID: 20050128232812.0214B1CEBB () office ! kde ! org
[Download RAW message or body]

CVS commit by luebking: 


added support for unshadowed moving windows, slight changes to updates on shapable windows


  M +2 -3      client.cpp   1.448
  M +2 -2      geometry.cpp   2.101
  M +3 -1      manage.cpp   2.71
  M +1 -0      options.cpp   1.110
  M +1 -0      options.h   1.70


--- kdebase/kwin/client.cpp  #1.447:1.448
@@ -355,9 +355,9 @@ void Client::detectNoBorder()
         case NET::Utility :
             noborder = false;
+            setShapable(FALSE);
           break;
         default:
             assert( false );
         }
-        setShapable(FALSE);
     }
 
@@ -420,4 +420,5 @@ void Client::setUserNoBorder( bool set )
 void Client::updateShape()
     {
+    setShapable(TRUE);
     if ( shape() )
     {
@@ -425,5 +426,4 @@ void Client::updateShape()
                            clientPos().x(), clientPos().y(),
                            window(), ShapeBounding, ShapeSet);
-        setShapable(TRUE);
     }
     else
@@ -431,5 +431,4 @@ void Client::updateShape()
         XShapeCombineMask( qt_xdisplay(), frameId(), ShapeBounding, 0, 0,
                            None, ShapeSet);
-        setShapable(TRUE);
     }
     // workaround for #19644 - shaped windows shouldn't have decoration

--- kdebase/kwin/geometry.cpp  #2.100:2.101
@@ -2125,5 +2125,5 @@ bool Client::startMoveResize()
     checkUnrestrictedMoveResize();
     // rule out non opaque windows from useless translucency settings, maybe resizes?
-    if (isResize() && options->removeShadowsOnResize)
+    if ((isResize() && options->removeShadowsOnResize) || (isMove() && options->removeShadowsOnMove))
         setShadowSize(0);
     if (rules()->checkMoveResizeMode( options->moveMode ) == Options::Opaque){
@@ -2165,5 +2165,5 @@ void Client::leaveMoveResize()
     if (rules()->checkMoveResizeMode( options->moveMode ) == Options::Opaque)
         setOpacity(true, savedOpacity_);
-    if (isResize() && options->removeShadowsOnResize)
+    if ((isResize() && options->removeShadowsOnResize) || (isMove() && options->removeShadowsOnMove))
         updateShadowSize();
     clearbound();

--- kdebase/kwin/manage.cpp  #2.70:2.71
@@ -310,4 +310,6 @@ bool Client::manage( Window w, bool isMa
         updateShape();
         }
+//    else
+//      setShapable(FALSE);
 
     //CT extra check for stupid jdk 1.3.1. But should make sense in general

--- kdebase/kwin/options.cpp  #1.109:1.110
@@ -187,4 +187,5 @@ unsigned long Options::updateSettings()
     inactiveWindowShadowSize = config->readNumEntry("InactiveWindowShadowSize", 100);
     dockShadowSize = config->readNumEntry("DockShadowSize", 100);
+    removeShadowsOnMove = config->readBoolEntry("RemoveShadowsOnMove", true);
     removeShadowsOnResize = config->readBoolEntry("RemoveShadowsOnResize", true);
     if (resetKompmgr = config->readBoolEntry("ResetKompmgr", false))

--- kdebase/kwin/options.h  #1.69:1.70
@@ -266,4 +266,5 @@ class Options : public KDecorationOption
         uint movingWindowOpacity;
         bool removeShadowsOnResize;
+        bool removeShadowsOnMove;
         bool translucentDocks;
         uint dockOpacity;


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