Merge tag 'v2.1.4' into debian/sid

1 files changed, 8 insertions, 2 deletions

diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp
index ddbc404..3615685 100644
--- a/src/gui/tikzview.cpp
+++ b/src/gui/tikzview.cpp
@@ -134,10 +134,16 @@ void TikzView::drawBackground(QPainter *painter, const QRectF &rect)
 
 void TikzView::wheelEvent(QWheelEvent *event)
 {
-    if (event->modifiers() & Qt::ShiftModifier) {
+    QSettings settings("tikzit", "tikzit");
+    bool shiftScroll = settings.value("shift-to-scroll", false).toBool();
+    if ((!shiftScroll && event->modifiers() == Qt::NoModifier) ||
+        (shiftScroll && (event->modifiers() == Qt::ShiftModifier)))
+    {
         event->setModifiers(Qt::NoModifier);
         QGraphicsView::wheelEvent(event);
-    } else if (event->modifiers() & Qt::ControlModifier) {
+    }
+
+    if (event->modifiers() & Qt::ControlModifier) {
         if (event->angleDelta().y() > 0) {
             zoomIn();
         } else if (event->angleDelta().y() < 0) {