From ae57e23eecb21ac6256745a05567b6dda1abf5f3 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 1 Mar 2018 19:48:41 +0100 Subject: [PATCH] Create a mouse area around the sidebar to avoid propagating mouse wheel events. Contributes to CURA-4495 --- resources/qml/Cura.qml | 8 ++++++++ resources/qml/Settings/SettingView.qml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 191aa59690..0b4c8089c8 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -476,6 +476,14 @@ UM.MainWindow collapseSidebarAnimation.start(); } } + + MouseArea + { + visible: UM.Controller.activeStage.sidebarComponent != "" + anchors.fill: parent + acceptedButtons: Qt.AllButtons + onWheel: wheel.accepted = true + } } UM.MessageStack diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 47c8b188ad..46842baa98 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -142,7 +142,7 @@ Item TextField { id: filter; - + height: parent.height anchors.left: parent.left anchors.right: clearFilterButton.left anchors.rightMargin: Math.round(UM.Theme.getSize("sidebar_margin").width)