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

List:       kde-commits
Subject:    KDE/kdegraphics/kolourpaint
From:       Ambroz Bizjak <ambro () b4ever ! net>
Date:       2008-08-14 17:54:21
Message-ID: 1218736461.299720.26201.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 847084 by abizjak:

Don't draw resize lines over parts of the user interface


 M  +9 -3      kpViewScrollableContainer.cpp  


--- trunk/KDE/kdegraphics/kolourpaint/kpViewScrollableContainer.cpp #847083:847084
@@ -605,10 +605,12 @@
     if (m_resizeRoundedLastViewX < 0 || m_resizeRoundedLastViewY < 0)
         return QRect ();
 
+    QRect visibleArea = QRect(QPoint(contentsX(),contentsY()), viewport()->size());
+
     return QRect (QPoint (0,
                           m_resizeRoundedLastViewY),
                   QPoint (m_resizeRoundedLastViewX - 1,
-                          m_resizeRoundedLastViewY + bottomResizeLineWidth () - 1));
+                          m_resizeRoundedLastViewY + bottomResizeLineWidth () - \
1)).intersected(visibleArea);  }
 
 // protected
@@ -617,10 +619,12 @@
     if (m_resizeRoundedLastViewX < 0 || m_resizeRoundedLastViewY < 0)
         return QRect ();
 
+    QRect visibleArea = QRect(QPoint(contentsX(),contentsY()), viewport()->size());
+
     return QRect (QPoint (m_resizeRoundedLastViewX,
                           0),
                   QPoint (m_resizeRoundedLastViewX + rightResizeLineWidth () - 1,
-                          m_resizeRoundedLastViewY - 1));
+                          m_resizeRoundedLastViewY - 1)).intersected(visibleArea);
 }
 
 // protected
@@ -629,10 +633,12 @@
     if (m_resizeRoundedLastViewX < 0 || m_resizeRoundedLastViewY < 0)
         return QRect ();
 
+    QRect visibleArea = QRect(QPoint(contentsX(),contentsY()), viewport()->size());
+
     return QRect (QPoint (m_resizeRoundedLastViewX,
                           m_resizeRoundedLastViewY),
                   QPoint (m_resizeRoundedLastViewX + rightResizeLineWidth () - 1,
-                          m_resizeRoundedLastViewY + bottomResizeLineWidth () - 1));
+                          m_resizeRoundedLastViewY + bottomResizeLineWidth () - \
1)).intersected(visibleArea);  }
 
 


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