summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2014-11-28 17:30:40 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2014-12-02 12:08:32 +0100
commitbd5e9d8685783f842f631a1355dee9f3471ae8f7 (patch)
treeff9bea65cc0fe52877008917b6e4eb63fd0e3276
parent016ce1d46c6ebb29e9b8a9d7667876d9bb1c37bc (diff)
downloadqttools-bd5e9d8685783f842f631a1355dee9f3471ae8f7.tar.gz
Designer: Do not filter out wheel events on form containers.
Otherwise, scrolling with the mouse wheel over the form no longer works. Task-number: QTBUG-42927 Change-Id: Ib9022bd3c8e158ca10965602c134415c5c4f7039 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
-rw-r--r--src/designer/src/components/formeditor/tool_widgeteditor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.cpp b/src/designer/src/components/formeditor/tool_widgeteditor.cpp
index 56fd473ac..bea64f727 100644
--- a/src/designer/src/components/formeditor/tool_widgeteditor.cpp
+++ b/src/designer/src/components/formeditor/tool_widgeteditor.cpp
@@ -130,6 +130,10 @@ bool WidgetEditorTool::handleEvent(QWidget *widget, QWidget *managedWidget, QEve
return !(passive || widget == m_formWindow || widget == m_formWindow->mainContainer());
case QEvent::Wheel: // Prevent spinboxes and combos from reacting
+ if (widget == m_formWindow->formContainer() || widget == m_formWindow
+ || widget == m_formWindow->mainContainer()) { // Allow scrolling the form with wheel.
+ return false;
+ }
return !passive;
case QEvent::KeyPress: