Diagram view, improve behavior with track pad

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3293 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-08-31 09:45:01 +00:00
parent 1fd72b7feb
commit 120696d822

View File

@@ -584,8 +584,8 @@ void DiagramView::mouseReleaseEvent(QMouseEvent *e) {
* @return
*/
bool DiagramView::gestures() const {
return(QETApp::settings().value("diagramview/gestures", true).toBool());
}
return(QETApp::settings().value("diagramview/gestures", true).toBool());
}
/**
Manage wheel event of mouse
@@ -593,20 +593,14 @@ bool DiagramView::gestures() const {
*/
void DiagramView::wheelEvent(QWheelEvent *e) {
//Zoom and scrolling
if (e->buttons() != Qt::MidButton & !gestures ()) {
if (!(e -> modifiers() & Qt::ControlModifier )) {
if (e -> delta() > 0){
zoomIn();
}
else{
zoomOut();
}
}
} else {
QAbstractScrollArea::wheelEvent(e);
}
if ( gestures() ) {
if (e -> modifiers() & Qt::ControlModifier)
e -> delta() > 0 ? zoomInSlowly() : zoomOutSlowly();
else
QGraphicsView::wheelEvent(e);
} else {
e -> delta() > 0 ? zoomIn(): zoomOut();
}
}