QmlDesigner.PropertyEditor: Hide action indidactors on controls

Task-number: QDS-1688
Change-Id: Ia96a8d5229b42d9ac0be75273cadfc35b5cef334
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/LayoutPoperties.qml

@@ -140,7 +140,7 @@ SectionLayout {
             actionIndicator.icon.color: extFuncLogic.color
             actionIndicator.icon.text: extFuncLogic.glyph
             actionIndicator.onClicked: extFuncLogic.show()
-
+            actionIndicator.forceVisible: extFuncLogic.menuVisible
             actionIndicator.visible: true
 
             labelColor: horizontalAlignmentComboBox.currentIndex === 0 ? colorLogic.__defaultTextColor : colorLogic.__changedTextColor
@@ -176,7 +176,7 @@ SectionLayout {
             actionIndicator.icon.color: extFuncLogic.color
             actionIndicator.icon.text: extFuncLogic.glyph
             actionIndicator.onClicked: extFuncLogic.show()
-
+            actionIndicator.forceVisible: extFuncLogic.menuVisible
             actionIndicator.visible: true
 
             labelColor: verticalAlignmentComboBox.currentIndex === 0 ? colorLogic.__defaultTextColor : colorLogic.__changedTextColor

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AligmentHorizontalButtons.qml

@@ -93,6 +93,7 @@ Row {
         actionIndicator.icon.color: extFuncLogic.color
         actionIndicator.icon.text: extFuncLogic.glyph
         actionIndicator.onClicked: extFuncLogic.show()
+        actionIndicator.forceVisible: extFuncLogic.menuVisible
 
         StudioControls.ButtonGroup {
             id: group

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AligmentVerticalButtons.qml

@@ -93,6 +93,7 @@ Row {
         actionIndicator.icon.color: extFuncLogic.color
         actionIndicator.icon.text: extFuncLogic.glyph
         actionIndicator.onClicked: extFuncLogic.show()
+        actionIndicator.forceVisible: extFuncLogic.menuVisible
 
         StudioControls.ButtonGroup {
             id: group

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/BoolButtonRowButton.qml

@@ -87,4 +87,5 @@ StudioControls.Button {
     actionIndicator.icon.color: extFuncLogic.color
     actionIndicator.icon.text: extFuncLogic.glyph
     actionIndicator.onClicked: extFuncLogic.show()
+    actionIndicator.forceVisible: extFuncLogic.menuVisible
 }

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml

@@ -40,6 +40,7 @@ StudioControls.CheckBox {
     actionIndicator.icon.color: extFuncLogic.color
     actionIndicator.icon.text: extFuncLogic.glyph
     actionIndicator.onClicked: extFuncLogic.show()
+    actionIndicator.forceVisible: extFuncLogic.menuVisible
 
     labelColor: colorLogic.textColor
     ColorLogic {

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml

@@ -57,6 +57,7 @@ StudioControls.ComboBox {
     actionIndicator.icon.color: extFuncLogic.color
     actionIndicator.icon.text: extFuncLogic.glyph
     actionIndicator.onClicked: extFuncLogic.show()
+    actionIndicator.forceVisible: extFuncLogic.menuVisible
 
     actionIndicator.visible: comboBox.showExtendedFunctionButton
 

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionLogic.qml

@@ -42,6 +42,8 @@ Item {
 
     signal reseted
 
+    property bool menuVisible: false
+
     function show() {
         menuLoader.show()
     }
@@ -97,6 +99,10 @@ Item {
                 onAboutToShow: {
                     exportMenuItem.checked = backendValue.hasPropertyAlias()
                     exportMenuItem.enabled = !backendValue.isAttachedProperty()
+                    extendedFunctionButton.menuVisible = true
+                }
+                onAboutToHide: {
+                    extendedFunctionButton.menuVisible = false
                 }
 
                 StudioControls.MenuItem {

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontComboBox.qml

@@ -81,6 +81,7 @@ StudioControls.ComboBox {
     actionIndicator.icon.color: extFuncLogic.color
     actionIndicator.icon.text: extFuncLogic.glyph
     actionIndicator.onClicked: extFuncLogic.show()
+    actionIndicator.forceVisible: extFuncLogic.menuVisible
 
     property bool showExtendedFunctionButton: true
 

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml

@@ -70,6 +70,7 @@ StudioControls.TextField {
     actionIndicator.icon.color: extFuncLogic.color
     actionIndicator.icon.text: extFuncLogic.glyph
     actionIndicator.onClicked: extFuncLogic.show()
+    actionIndicator.forceVisible: extFuncLogic.menuVisible
 
     ColorLogic {
         id: colorLogic

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml

@@ -84,6 +84,8 @@ Item {
         actionIndicator.icon.text: extFuncLogic.glyph
         actionIndicator.onClicked: extFuncLogic.show()
 
+        actionIndicator.forceVisible: extFuncLogic.menuVisible
+
         ColorLogic {
             id: colorLogic
             backendValue: spinBox.backendValue

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml

@@ -53,6 +53,7 @@ RowLayout {
         actionIndicator.icon.color: extFuncLogic.color
         actionIndicator.icon.text: extFuncLogic.glyph
         actionIndicator.onClicked: extFuncLogic.show()
+        actionIndicator.forceVisible: extFuncLogic.menuVisible
 
         ExtendedFunctionLogic {
             id: extFuncLogic

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml

@@ -37,6 +37,7 @@ Rectangle {
 
     property bool hover: false
     property bool pressed: false
+    property bool forceVisible: false
 
     color: actionIndicator.showBackground ? StudioTheme.Values.themeControlBackground : "transparent"
     border.color: actionIndicator.showBackground ? StudioTheme.Values.themeControlOutline : "transparent"
@@ -50,6 +51,7 @@ Rectangle {
         id: actionIndicatorIcon
         anchors.fill: parent
         text: StudioTheme.Constants.actionIcon
+        visible: text != StudioTheme.Constants.actionIcon || actionIndicator.forceVisible
         color: StudioTheme.Values.themeTextColor
         font.family: StudioTheme.Constants.iconFont.family
         font.pixelSize: StudioTheme.Values.myIconFontSize
@@ -65,6 +67,7 @@ Rectangle {
                 PropertyChanges {
                     target: actionIndicatorIcon
                     scale: 1.2
+                    visible: true
                 }
             },
             State {