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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdelibs/kdeui
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2004-06-28 14:48:59
Message-ID: 20040628144859.E66F59992 () office ! kde ! org
[Download RAW message or body]

CVS commit by lukas: 

backport CVS commit by rich: 

- Added a sanity check for passive popups overrunning the right edge of the
   screen. (#55028)


  M +3 -5      kpassivepopup.cpp   1.24.2.1


--- kdelibs/kdeui/kpassivepopup.cpp  #1.24:1.24.2.1
@@ -245,4 +245,7 @@ void KPassivePopup::moveNear( QRect targ
         y = r.height() - h;
 
+    if ( (x + w) > r.width() )
+        x = r.width() - w;
+
     if ( y < 0 )
         y = 0;
@@ -251,9 +254,4 @@ void KPassivePopup::moveNear( QRect targ
         x = 0;
 
-#ifdef OLD_BITS
-    if ( (x - w) >= 0  )
-        x = x - w;
-#endif
-
     move( x, y );
 }


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