Mercurial > hg > svgui

diff view/Pane.h @ 373:0895517bb2d1 1.2-stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents 4f4f38a11cd2
children 755243c67f59
line wrap: on
line diff
--- a/view/Pane.h	Thu Nov 29 10:43:54 2007 +0000
+++ b/view/Pane.h	Wed Feb 27 10:32:45 2008 +0000
@@ -142,6 +142,8 @@
 
     bool m_navigating;
     bool m_resizing;
+    bool m_editing;
+    bool m_releasing;
     size_t m_dragCentreFrame;
     float m_dragStartMinValue;
     bool m_centreLineVisible;
@@ -158,6 +160,14 @@
     };
     DragMode m_dragMode;
 
+    DragMode updateDragMode(DragMode currentMode,
+                            QPoint origin,
+                            QPoint currentPoint,
+                            bool canMoveHorizontal,
+                            bool canMoveVertical,
+                            bool resistHorizontal,
+                            bool resistVertical);
+
     QWidget *m_headsUpDisplay;
     Panner *m_vpan;
     Thumbwheel *m_hthumb;