From 653b9ba215e0d8f37a37dfb9a4a5f4abe4517205 Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Mon, 2 Dec 2024 12:18:43 +0200 Subject: [PATCH] EffectComposer: Enable mouse wheel scroll for the uniforms view Task-number: QDS-14246 Change-Id: I605a5ca5ee5e4763b897486183b46adbb2ca4e53 Reviewed-by: Miikka Heikkinen --- .../effectComposerQmlSources/CodeEditorUniformsView.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/CodeEditorUniformsView.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/CodeEditorUniformsView.qml index decb076094a..774bf2db3f2 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/CodeEditorUniformsView.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/CodeEditorUniformsView.qml @@ -62,7 +62,7 @@ ColumnLayout { columnSpacing: -StudioTheme.Values.border rowSpacing: -StudioTheme.Values.border clip: true - interactive: false + interactive: true selectionMode: TableView.SingleSelection selectionBehavior: TableView.SelectRows selectionModel: ItemSelectionModel {} @@ -140,7 +140,7 @@ ColumnLayout { visible: !tableView.hideHorizontalScrollBar - show: (hoverHandler.hovered || tableView.focus || tableView.adsFocus + show: (hoverHandler.hovered || tableView.focus || horizontalScrollBar.inUse || horizontalScrollBar.otherInUse) && horizontalScrollBar.isNeeded otherInUse: verticalScrollBar.inUse @@ -158,8 +158,8 @@ ColumnLayout { visible: !tableView.hideVerticalScrollBar - show: (hoverHandler.hovered || tableView.focus || tableView.adsFocus - || horizontalScrollBar.inUse || horizontalScrollBar.otherInUse) + show: (hoverHandler.hovered || tableView.focus + || verticalScrollBar.inUse || verticalScrollBar.otherInUse) && verticalScrollBar.isNeeded otherInUse: horizontalScrollBar.inUse }