comparison view/Pane.h @ 756:9cfcb2924ee3 tony_integration

Merge from branch tonioni
author Chris Cannam
date Wed, 02 Apr 2014 08:51:33 +0100
parents 09e2677e34e7
children 30bc7b2155dc
comparison
equal deleted inserted replaced
755:ad01e7d4a956 756:9cfcb2924ee3
134 void dragTopLayer(QMouseEvent *e); 134 void dragTopLayer(QMouseEvent *e);
135 void dragExtendSelection(QMouseEvent *e); 135 void dragExtendSelection(QMouseEvent *e);
136 void updateContextHelp(const QPoint *pos); 136 void updateContextHelp(const QPoint *pos);
137 void edgeScrollMaybe(int x); 137 void edgeScrollMaybe(int x);
138 138
139 Layer *getTopFlexiNoteLayer();
140
139 bool m_identifyFeatures; 141 bool m_identifyFeatures;
140 QPoint m_identifyPoint; 142 QPoint m_identifyPoint;
141 QPoint m_clickPos; 143 QPoint m_clickPos;
142 QPoint m_mousePos; 144 QPoint m_mousePos;
143 bool m_clickedInRange; 145 bool m_clickedInRange;