comparison view/Pane.h @ 374:64e84e5efb76 spectrogram-cache-rejig

* Merge from trunk
author Chris Cannam
date Wed, 27 Feb 2008 11:59:42 +0000
parents 4f4f38a11cd2
children 755243c67f59
comparison
equal deleted inserted replaced
332:6440e280122e 374:64e84e5efb76
140 bool m_shiftPressed; 140 bool m_shiftPressed;
141 bool m_ctrlPressed; 141 bool m_ctrlPressed;
142 142
143 bool m_navigating; 143 bool m_navigating;
144 bool m_resizing; 144 bool m_resizing;
145 bool m_editing;
146 bool m_releasing;
145 size_t m_dragCentreFrame; 147 size_t m_dragCentreFrame;
146 float m_dragStartMinValue; 148 float m_dragStartMinValue;
147 bool m_centreLineVisible; 149 bool m_centreLineVisible;
148 size_t m_selectionStartFrame; 150 size_t m_selectionStartFrame;
149 Selection m_editingSelection; 151 Selection m_editingSelection;
156 HorizontalDrag, 158 HorizontalDrag,
157 FreeDrag 159 FreeDrag
158 }; 160 };
159 DragMode m_dragMode; 161 DragMode m_dragMode;
160 162
163 DragMode updateDragMode(DragMode currentMode,
164 QPoint origin,
165 QPoint currentPoint,
166 bool canMoveHorizontal,
167 bool canMoveVertical,
168 bool resistHorizontal,
169 bool resistVertical);
170
161 QWidget *m_headsUpDisplay; 171 QWidget *m_headsUpDisplay;
162 Panner *m_vpan; 172 Panner *m_vpan;
163 Thumbwheel *m_hthumb; 173 Thumbwheel *m_hthumb;
164 Thumbwheel *m_vthumb; 174 Thumbwheel *m_vthumb;
165 NotifyingPushButton *m_reset; 175 NotifyingPushButton *m_reset;