panel: Fix reserved space on screen

After @fde6b272e2fec87b5567c252bf28fe0348aa9afb calculation of reserved space was broken for multihead configurations with different particular resolutions.
tsimonq2 · Oct 30, 2015 · b0965b2 · b0965b2
1 parent acc90ef
commit b0965b2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/panel/lxqtpanel.cpp b/panel/lxqtpanel.cpp
@@ -472,6 +472,7 @@ void LXQtPanel::updateWmStrut()
     if(wid == 0 || !isVisible())
         return;
 
+    const QRect wholeScreen = QApplication::desktop()->geometry();
     const QRect rect = geometry();
     // NOTE: http://standards.freedesktop.org/wm-spec/wm-spec-latest.html
     // Quote from the EWMH spec: " Note that the strut is relative to the screen edge, and not the edge of the xinerama monitor."
@@ -484,7 +485,7 @@ void LXQtPanel::updateWmStrut()
         KWindowSystem::setExtendedStrut(wid,
                                         /* Left   */  0, 0, 0,
                                         /* Right  */  0, 0, 0,
-                                        /* Top    */  getReserveDimension(), rect.left(), rect.right(),
+                                        /* Top    */  rect.top() + getReserveDimension(), rect.left(), rect.right(),
                                         /* Bottom */  0, 0, 0
                                        );
         break;
@@ -494,13 +495,13 @@ void LXQtPanel::updateWmStrut()
                                         /* Left   */  0, 0, 0,
                                         /* Right  */  0, 0, 0,
                                         /* Top    */  0, 0, 0,
-                                        /* Bottom */  getReserveDimension(), rect.left(), rect.right()
+                                        /* Bottom */  wholeScreen.bottom() - rect.bottom() + getReserveDimension(), rect.left(), rect.right()
                                        );
         break;
 
     case LXQtPanel::PositionLeft:
         KWindowSystem::setExtendedStrut(wid,
-                                        /* Left   */  getReserveDimension(), rect.top(), rect.bottom(),
+                                        /* Left   */  rect.left() + getReserveDimension(), rect.top(), rect.bottom(),
                                         /* Right  */  0, 0, 0,
                                         /* Top    */  0, 0, 0,
                                         /* Bottom */  0, 0, 0
@@ -511,7 +512,7 @@ void LXQtPanel::updateWmStrut()
     case LXQtPanel::PositionRight:
         KWindowSystem::setExtendedStrut(wid,
                                         /* Left   */  0, 0, 0,
-                                        /* Right  */  getReserveDimension(), rect.top(), rect.bottom(),
+                                        /* Right  */  wholeScreen.right() - rect.right() + getReserveDimension(), rect.top(), rect.bottom(),
                                         /* Top    */  0, 0, 0,
                                         /* Bottom */  0, 0, 0
                                        );