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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/pager
From:       Marco Martin <notmart () gmail ! com>
Date:       2008-11-16 14:02:12
Message-ID: 1226844132.311352.30803.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 884998 by mart:

since now the margin can be used also when the custom background is off
always do the fittlaw-ification of mouse hits


 M  +15 -19    pager.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/pager/pager.cpp #884997:884998
@@ -220,27 +220,23 @@
     qreal rightMargin;
     qreal bottomMargin;
 
-    if (m_showOwnBackground && m_background) {
-        m_background->setElementPrefix(QString());
-        m_background->getMargins(leftMargin, topMargin, rightMargin, bottomMargin);
+    m_background->setElementPrefix(QString());
+    m_background->getMargins(leftMargin, topMargin, rightMargin, bottomMargin);
 
-        if (r.left() > leftMargin) {
-            leftMargin = 0;
-        }
-        if (r.top() > topMargin) {
-            leftMargin = 0;
-        }
-        if (geometry().width() - r.right() < rightMargin) {
-            leftMargin = 0;
-        }
-        if (geometry().bottom() - r.bottom() < bottomMargin) {
-            leftMargin = 0;
-        }
-
-        return r.adjusted(-leftMargin, -topMargin, rightMargin, bottomMargin).contains(pos);
-    } else {
-        return r.contains(pos);
+    if (r.left() > leftMargin) {
+        leftMargin = 0;
     }
+    if (r.top() > topMargin) {
+        leftMargin = 0;
+    }
+    if (geometry().width() - r.right() < rightMargin) {
+        leftMargin = 0;
+    }
+    if (geometry().bottom() - r.bottom() < bottomMargin) {
+        leftMargin = 0;
+    }
+
+    return r.adjusted(-leftMargin, -topMargin, rightMargin, bottomMargin).contains(pos);
 }
 
 void Pager::recalculateGeometry()
[prev in list] [next in list] [prev in thread] [next in thread]