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

List:       kde-commits
Subject:    KDE/kdebase/kicker/kicker/core
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2006-02-20 15:10:33
Message-ID: 1140448233.947944.17582.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 511635 by lunakl:

Reserve struts even at xinerama edges that are not total virtual screen edges.



 M  +13 -30    container_extension.cpp  


--- trunk/KDE/kdebase/kicker/kicker/core/container_extension.cpp #511634:511635
@@ -955,48 +955,31 @@
             h = height();
         }
 
-        //FIXME do not set the strut if the edge we are placing ourselves along is not also an edge
-        //of the virual screen, since NETWM has no way to represent the resulting non-rectangular
-        //client areas that can result in an Xinerama environment.
-        //Remove these checks if NetWM ever gets smarter about this (either struts that don't take
-        //up an entire edge or per-screen struts
         switch (position())
         {
             case Plasma::Top:
-                if (screenRect.top() == virtRect.top())
-                {
-                    strut.top_width = geom.y() + h;
-                    strut.top_start = x();
-                    strut.top_end = x() + width() - 1;
-                }
+                strut.top_width = geom.y() + h;
+                strut.top_start = x();
+                strut.top_end = x() + width() - 1;
                 break;
 
             case Plasma::Bottom:
-                if (screenRect.bottom() == virtRect.bottom())
-                {
-                    // also claim the non-visible part at the bottom
-                    strut.bottom_width = (virtRect.bottom() - geom.bottom()) + h;
-                    strut.bottom_start = x();
-                    strut.bottom_end = x() + width() - 1;
-                }
+                // also claim the non-visible part at the bottom
+                strut.bottom_width = (virtRect.bottom() - geom.bottom()) + h;
+                strut.bottom_start = x();
+                strut.bottom_end = x() + width() - 1;
                 break;
 
             case Plasma::Right:
-                if (screenRect.right() == virtRect.right())
-                {
-                    strut.right_width = (virtRect.right() - geom.right()) + w;
-                    strut.right_start = y();
-                    strut.right_end = y() + height() - 1;
-                }
+                strut.right_width = (virtRect.right() - geom.right()) + w;
+                strut.right_start = y();
+                strut.right_end = y() + height() - 1;
                 break;
 
             case Plasma::Left:
-                if(screenRect.left() == virtRect.left())
-                {
-                    strut.left_width = geom.x() + w;
-                    strut.left_start = y();
-                    strut.left_end = y() + height() - 1;
-                }
+                strut.left_width = geom.x() + w;
+                strut.left_start = y();
+                strut.left_end = y() + height() - 1;
                 break;
 
             case Plasma::Floating:
[prev in list] [next in list] [prev in thread] [next in thread]