diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/PreviewError.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/PreviewError.qml index 29ce584c9d6..1df03250704 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/PreviewError.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/PreviewError.qml @@ -37,25 +37,20 @@ Rectangle { } } - MouseArea { - id: errorMouseArea + HelperWidgets.Button { + id: showLessButton - hoverEnabled: true - acceptedButtons: Qt.NoButton - anchors.fill: parent + width: 100 + height: 30 + text: qsTr("Show Less") + visible: root.showErrorDetails + opacity: scrollView.hovered || showLessButton.hovered ? 1 : 0.3 + anchors.right: parent.right + anchors.bottom: parent.bottom + anchors.bottomMargin: 8 + anchors.rightMargin: 8 + StudioTheme.Values.scrollBarThicknessHover - HelperWidgets.Button { - width: 100 - height: 30 - text: qsTr("Show Less") - visible: root.showErrorDetails - opacity: errorMouseArea.containsMouse ? 1 : 0.3 - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.margins: 4 - - onClicked: root.showErrorDetails = false - } + onClicked: root.showErrorDetails = false } Column { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ScrollView.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ScrollView.qml index 707f3e5669d..828aa7f1657 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ScrollView.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ScrollView.qml @@ -15,7 +15,6 @@ Flickable { readonly property bool horizontalScrollBarVisible: horizontalScrollBar.scrollBarVisible readonly property bool bothVisible: flickable.verticalScrollBarVisible && flickable.horizontalScrollBarVisible - property bool hideVerticalScrollBar: false property bool hideHorizontalScrollBar: false @@ -24,6 +23,8 @@ Flickable { default property alias content: areaItem.children property bool adsFocus: false + property alias hovered: hoverHandler.hovered + // objectName is used by the dock widget to find this particular ScrollView // and set the ads focus on it. objectName: "__mainSrollView"