forked from qt-creator/qt-creator
QmlDesigner: Fix faulty color during IconButton hover animation
Also removed hover animation from IconButton based on UX. Fixes: QDS-7432 Change-Id: Ic9b218a288cf30079844b93bbcaec30a9024ca79 Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -47,7 +47,7 @@ Rectangle {
|
|||||||
IconButton {
|
IconButton {
|
||||||
icon: StudioTheme.Constants.applyMaterialToSelected
|
icon: StudioTheme.Constants.applyMaterialToSelected
|
||||||
|
|
||||||
normalColor: "transparent"
|
normalColor: StudioTheme.Values.themeSectionHeadBackground
|
||||||
iconSize: StudioTheme.Values.bigIconFontSize
|
iconSize: StudioTheme.Values.bigIconFontSize
|
||||||
buttonSize: root.height
|
buttonSize: root.height
|
||||||
enabled: hasMaterial && hasModelSelection && hasQuick3DImport
|
enabled: hasMaterial && hasModelSelection && hasQuick3DImport
|
||||||
@@ -58,7 +58,7 @@ Rectangle {
|
|||||||
IconButton {
|
IconButton {
|
||||||
icon: StudioTheme.Constants.newMaterial
|
icon: StudioTheme.Constants.newMaterial
|
||||||
|
|
||||||
normalColor: "transparent"
|
normalColor: StudioTheme.Values.themeSectionHeadBackground
|
||||||
iconSize: StudioTheme.Values.bigIconFontSize
|
iconSize: StudioTheme.Values.bigIconFontSize
|
||||||
buttonSize: root.height
|
buttonSize: root.height
|
||||||
enabled: hasQuick3DImport
|
enabled: hasQuick3DImport
|
||||||
@@ -69,7 +69,7 @@ Rectangle {
|
|||||||
IconButton {
|
IconButton {
|
||||||
icon: StudioTheme.Constants.deleteMaterial
|
icon: StudioTheme.Constants.deleteMaterial
|
||||||
|
|
||||||
normalColor: "transparent"
|
normalColor: StudioTheme.Values.themeSectionHeadBackground
|
||||||
iconSize: StudioTheme.Values.bigIconFontSize
|
iconSize: StudioTheme.Values.bigIconFontSize
|
||||||
buttonSize: root.height
|
buttonSize: root.height
|
||||||
enabled: hasMaterial && hasQuick3DImport
|
enabled: hasMaterial && hasQuick3DImport
|
||||||
@@ -80,7 +80,7 @@ Rectangle {
|
|||||||
IconButton {
|
IconButton {
|
||||||
icon: StudioTheme.Constants.openMaterialBrowser
|
icon: StudioTheme.Constants.openMaterialBrowser
|
||||||
|
|
||||||
normalColor: "transparent"
|
normalColor: StudioTheme.Values.themeSectionHeadBackground
|
||||||
iconSize: StudioTheme.Values.bigIconFontSize
|
iconSize: StudioTheme.Values.bigIconFontSize
|
||||||
buttonSize: root.height
|
buttonSize: root.height
|
||||||
enabled: hasMaterial && hasQuick3DImport
|
enabled: hasMaterial && hasQuick3DImport
|
||||||
|
@@ -176,7 +176,6 @@ Column {
|
|||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
IconButton {
|
IconButton {
|
||||||
icon: StudioTheme.Constants.materialPreviewEnvironment
|
icon: StudioTheme.Constants.materialPreviewEnvironment
|
||||||
normalColor: "transparent"
|
|
||||||
iconSize: StudioTheme.Values.bigIconFontSize
|
iconSize: StudioTheme.Values.bigIconFontSize
|
||||||
buttonSize: previewOptions.width
|
buttonSize: previewOptions.width
|
||||||
tooltip: qsTr("Select preview environment.")
|
tooltip: qsTr("Select preview environment.")
|
||||||
@@ -184,7 +183,6 @@ Column {
|
|||||||
}
|
}
|
||||||
IconButton {
|
IconButton {
|
||||||
icon: StudioTheme.Constants.materialPreviewModel
|
icon: StudioTheme.Constants.materialPreviewModel
|
||||||
normalColor: "transparent"
|
|
||||||
iconSize: StudioTheme.Values.bigIconFontSize
|
iconSize: StudioTheme.Values.bigIconFontSize
|
||||||
buttonSize: previewOptions.width
|
buttonSize: previewOptions.width
|
||||||
tooltip: qsTr("Select preview model.")
|
tooltip: qsTr("Select preview model.")
|
||||||
|
@@ -51,13 +51,6 @@ Rectangle {
|
|||||||
: mouseArea.containsMouse ? hoverColor
|
: mouseArea.containsMouse ? hoverColor
|
||||||
: normalColor
|
: normalColor
|
||||||
|
|
||||||
Behavior on color {
|
|
||||||
ColorAnimation {
|
|
||||||
duration: 300
|
|
||||||
easing.type: Easing.OutQuad
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
id: icon
|
id: icon
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user