Merge pull request #6976 from theg4sh:linux-window-mouse-wheel-support

94109086 · Alexander Alekhin · df912076 · d394d26b · 94109086
Commit 94109086 authored Jul 24, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

window_QT.cpp modules/highgui/src/window_QT.cpp +0 -3

No files found.
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -2637,9 +2637,6 @@ void DefaultViewPort::wheelEvent(QWheelEvent* evnt)
    icvmouseHandler((QMouseEvent*)evnt, mouse_wheel, cv_event, flags);
    icvmouseProcessing(QPointF(pt), cv_event, flags);

-    scaleView(delta / 240.0, pt);
-    viewport()->update();
-
    QWidget::wheelEvent(evnt);
 }