GCodeProjects
diff --git a/‎3rdparty/kdiff3/mergeresultwindow.cpp‎
Lines changed: 8 additions & 2 deletions b/‎3rdparty/kdiff3/mergeresultwindow.cpp‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎3rdparty/kdiff3/pdiff.cpp‎
Lines changed: 6 additions & 4 deletions b/‎3rdparty/kdiff3/pdiff.cpp‎
Lines changed: 6 additions & 4 deletions
@@ -25,6 +25,7 @@
 #include <QTextStream>
 #include <QKeyEvent>
 #include <QMouseEvent>
+#include <QPoint>
 
 #include <QLineEdit>
 #include <QTextCodec>
@@ -2260,9 +2261,14 @@ void MergeResultWindow::slotCursorUpdate()
 
 void MergeResultWindow::wheelEvent(QWheelEvent *e)
 {
-    int d = -e->delta() * QApplication::wheelScrollLines() / 120;
+    QPoint d = e->pixelDelta();
+
+    if (d.isNull()) {
+        d = - e->angleDelta() / 120 * QApplication::wheelScrollLines();
+    }
+
     e->accept();
-    scroll(0, min2(d, getNofVisibleLines()));
+    scroll(d.x(), min2(d.y(), getNofVisibleLines()));
 }
 
 
 
@@ -30,6 +30,7 @@
 #include <qcombobox.h>
 #include <QDropEvent>
 #include <QUrl>
+#include <QPoint>
 #include <QProcess>
 
 #include <assert.h>
@@ -783,12 +784,13 @@ bool KDiff3App::eventFilter(QObject *o, QEvent *e)
         QWheelEvent *w = (QWheelEvent *)e;
         w->accept();
 
-        int deltaX = 0;
+        QPoint d = w->pixelDelta();
 
-        int d = w->delta();
-        int deltaY = -d / 120 * QApplication::wheelScrollLines();
+        if (d.isNull()) {
+            d = - w->angleDelta() / 120 * QApplication::wheelScrollLines();
+        }
 
-        scrollDiffTextWindow(deltaX, deltaY);
+        scrollDiffTextWindow(d.x(), d.y());
         return true;
     } else if (e->type() == QEvent::Drop) {
         QDropEvent *pDropEvent = static_cast<QDropEvent *>(e);