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

List:       kde-commits
Subject:    branches/KDE/4.4/kdeplasma-addons/applets/lancelot/libs/lancelot/widgets
From:       Ivan Čukić <ivan.cukic () kde ! org>
Date:       2010-02-12 21:36:59
Message-ID: 1266010619.022151.24493.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1089315 by ivan:

Backported crash fix



 M  +12 -14    ScrollPane.cpp  


--- branches/KDE/4.4/kdeplasma-addons/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp \
#1089314:1089315 @@ -217,12 +217,6 @@
         }
     }
 
-    if (hasVertical) {
-        Plasma::Animator::self()->registerScrollingManager(this);
-    } else {
-        Plasma::Animator::self()->unregisterScrollingManager(this);
-    }
-
     d->updateViewport();
 } //<
 
@@ -329,17 +323,21 @@
     QSizeF scrollableSize = d->widget->sizeFor(viewportSize);
 
     // Vertical scroll
-    if (d->vertical->value() > rect.top()) {
-        scrollVertical(rect.top());
-    } else if (d->vertical->value() + viewportSize.height() < rect.bottom()) {
-        scrollVertical(rect.bottom() - viewportSize.height());
+    if (d->vertical->isVisible()) {
+        if (d->vertical->value() > rect.top()) {
+            scrollVertical(rect.top());
+        } else if (d->vertical->value() + viewportSize.height() < rect.bottom()) {
+            scrollVertical(rect.bottom() - viewportSize.height());
+        }
     }
 
     // Horizontal scroll
-    if (d->horizontal->value() > rect.left()) {
-        scrollHorizontal(rect.left());
-    } else if (d->horizontal->value() + viewportSize.width() < rect.right()) {
-        scrollVertical(rect.right() - viewportSize.width());
+    if (d->horizontal->isVisible()) {
+        if (d->horizontal->value() > rect.left()) {
+            scrollHorizontal(rect.left());
+        } else if (d->horizontal->value() + viewportSize.width() < rect.right()) {
+            scrollHorizontal(rect.right() - viewportSize.width());
+        }
     }
 } //<
 


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