Re: [Rosegarden-devel] Auto-scrolling tweaks patch #2

[William]

This second patch is to fix the horizontal and vertical scroll directions
which were swapped with each other (without any functional effects).

William

--- gui/rosegardencanvasview.cpp.orig   2004-11-14 11:49:24.000000000 +0000
+++ gui/rosegardencanvasview.cpp        2004-11-14 14:30:29.000000000 +0000
@@ -141,10 +141,10 @@
     if (m_scrollDirectionConstraint & FollowVertical) {
         if ( p.y() < m_autoScrollYMargin ) {
             dy = -(int(m_minDeltaScroll));
-            scrollDirection = Left;
+            scrollDirection = Top;
         } else if ( p.y() > visibleHeight() - m_autoScrollYMargin ) {
             dy = +(int(m_minDeltaScroll));
-            scrollDirection = Right;
+            scrollDirection = Bottom;
         }
     }
     bool startDecelerating = false;
@@ -154,15 +154,15 @@
                startDecelerating = true;
                m_minDeltaScroll /= ScrollAccelValue;
            }
-            scrollDirection = Top;
             dx = -(int(m_minDeltaScroll));
+            scrollDirection = Left;
         } else if ( p.x() > visibleWidth() - m_autoScrollXMargin ) {
            if ( dp.x() < 0 ) {
                startDecelerating = true;
                m_minDeltaScroll /= ScrollAccelValue;
            }
-            scrollDirection = Bottom;
             dx = +(int(m_minDeltaScroll));
+            scrollDirection = Right;
         }
     }