chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added millisecond lock between Horizontal and Vertical Panning on Touchpads

Browse Source
This commit is contained in:
Mark Watkins 2013-11-09 10:59:35 +10:00
parent e29d7f7efe
commit ab5ae5ad49
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sleepyhead/Graphs/gGraphView.cpp
View File

@ -2403,6 +2403,9 @@ gGraphView::gGraphView(QWidget *parent, gGraphView * shared) :
m_selected_graph=NULL; m_selected_graph=NULL;
cubetex=0; cubetex=0;
horizScrollTime.start();
vertScrollTime.start();
this->setMouseTracking(true); this->setMouseTracking(true);
m_emptytext=QObject::tr("No Data"); m_emptytext=QObject::tr("No Data");
InitGraphs(); InitGraphs();
@ -3852,12 +3855,20 @@ void gGraphView::wheelEvent(QWheelEvent * event)
py+=graphSpacer; // do we want the extra spacer down the bottom? py+=graphSpacer; // do we want the extra spacer down the bottom?
} }
} else { } else {
// Vertical Scrolling if (event->orientation()==Qt::Vertical) { // Vertical Scrolling
if (event->orientation()==Qt::Vertical) { if (horizScrollTime.elapsed()<100)
return;
m_scrollbar->SendWheelEvent(event); // Just forwarding the event to scrollbar for now.. m_scrollbar->SendWheelEvent(event); // Just forwarding the event to scrollbar for now..
m_tooltip->cancel(); m_tooltip->cancel();
} else { vertScrollTime.start();
//Horinontal Panning } else { //Horizontal Panning
// (This is a total pain in the butt on MacBook touchpads..)
if (vertScrollTime.elapsed()<100)
return;
horizScrollTime.start();
gGraph *g=NULL; gGraph *g=NULL;
int group=0; int group=0;
@ -3872,6 +3883,7 @@ void gGraphView::wheelEvent(QWheelEvent * event)
} }
if (!g) { if (!g) {
// just pick any graph then
for (int i=0;i<m_graphs.size();i++) { for (int i=0;i<m_graphs.size();i++) {
if (!m_graphs[i]->isEmpty()) { if (!m_graphs[i]->isEmpty()) {
g=m_graphs[i]; g=m_graphs[i];
@ -3887,9 +3899,6 @@ void gGraphView::wheelEvent(QWheelEvent * event)
int delta=event->delta(); int delta=event->delta();
if (delta > 0) if (delta > 0)
g->min_x-=(xx/zoom)*(float)abs(delta); g->min_x-=(xx/zoom)*(float)abs(delta);
else else

2
sleepyhead/Graphs/gGraphView.h
View File

@ -1160,6 +1160,8 @@ protected:
qint32 pixmap_cache_size; qint32 pixmap_cache_size;
bool use_pixmap_cache; bool use_pixmap_cache;
QTime horizScrollTime, vertScrollTime;
//QVector<GLuint> texid; //QVector<GLuint> texid;
signals: signals: