feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix standalone ActionIndicator hover

Browse Source 
Change-Id: I55dbcdffcd755ea16e3dcfb17683c27f3e77e49f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2019-07-24 12:28:35 +02:00
committed by Henning Gründl
parent 0e159760e5
commit 6135726f4a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml
View File

@@ -60,7 +60,8 @@ Rectangle {
State { State {
name: "hovered" name: "hovered"
when: actionIndicator.hover && !actionIndicator.pressed when: actionIndicator.hover && !actionIndicator.pressed
&& !myControl.edit && !myControl.drag && myControl.enabled && (!myControl || (!myControl.edit && !myControl.drag))
&& actionIndicator.enabled
PropertyChanges { PropertyChanges {
target: actionIndicatorIcon target: actionIndicatorIcon
scale: 1.2 scale: 1.2
@@ -68,7 +69,7 @@ Rectangle {
}, },
State { State {
name: "disabled" name: "disabled"
when: !myControl.enabled when: !actionIndicator.enabled
PropertyChanges { PropertyChanges {
target: actionIndicatorIcon target: actionIndicatorIcon
color: StudioTheme.Values.themeTextColorDisabled color: StudioTheme.Values.themeTextColorDisabled