comparison view/Pane.h @ 826:43256b925e15 tonioni

Support horizontal two-finger scrolling on Mac, and adjust zoom rate on vertical scroll to make it less crazily fast
author Chris Cannam
date Fri, 18 Jul 2014 15:06:04 +0100
parents d974ed657176
children 4a578a360011
comparison
equal deleted inserted replaced
825:f7590917177c 826:43256b925e15
111 virtual void wheelEvent(QWheelEvent *e); 111 virtual void wheelEvent(QWheelEvent *e);
112 virtual void resizeEvent(QResizeEvent *e); 112 virtual void resizeEvent(QResizeEvent *e);
113 virtual void dragEnterEvent(QDragEnterEvent *e); 113 virtual void dragEnterEvent(QDragEnterEvent *e);
114 virtual void dropEvent(QDropEvent *e); 114 virtual void dropEvent(QDropEvent *e);
115 115
116 void wheelVertical(int sign, Qt::KeyboardModifiers);
117 void wheelHorizontal(int sign, Qt::KeyboardModifiers);
118 void wheelHorizontalFine(int pixels, Qt::KeyboardModifiers);
119
116 void drawVerticalScale(QRect r, Layer *, QPainter &); 120 void drawVerticalScale(QRect r, Layer *, QPainter &);
117 void drawFeatureDescription(Layer *, QPainter &); 121 void drawFeatureDescription(Layer *, QPainter &);
118 void drawCentreLine(int, QPainter &, bool omitLine); 122 void drawCentreLine(int, QPainter &, bool omitLine);
119 void drawModelTimeExtents(QRect, QPainter &, const Model *); 123 void drawModelTimeExtents(QRect, QPainter &, const Model *);
120 void drawDurationAndRate(QRect, const Model *, int, QPainter &); 124 void drawDurationAndRate(QRect, const Model *, int, QPainter &);
169 int m_selectionStartFrame; 173 int m_selectionStartFrame;
170 Selection m_editingSelection; 174 Selection m_editingSelection;
171 int m_editingSelectionEdge; 175 int m_editingSelectionEdge;
172 mutable int m_scaleWidth; 176 mutable int m_scaleWidth;
173 177
178 int m_pendingWheelAngle;
179
174 enum DragMode { 180 enum DragMode {
175 UnresolvedDrag, 181 UnresolvedDrag,
176 VerticalDrag, 182 VerticalDrag,
177 HorizontalDrag, 183 HorizontalDrag,
178 FreeDrag 184 FreeDrag