Skip to content
Snippets Groups Projects
Commit f7ad8804 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

accountcombobox: use smooth mouse state transitions

Change-Id: I11a89c5e58b4cfcb844ec88fe5801bc70c84c2dd
parent 191697b8
No related branches found
No related tags found
No related merge requests found
...@@ -85,7 +85,7 @@ ComboBox { ...@@ -85,7 +85,7 @@ ComboBox {
anchors.left: userImageRoot.right anchors.left: userImageRoot.right
anchors.leftMargin: 16 anchors.leftMargin: 16
anchors.top: rootItemBackground.top anchors.top: background.top
anchors.topMargin: 16 anchors.topMargin: 16
text: textMetricsUserAliasRoot.elidedText text: textMetricsUserAliasRoot.elidedText
...@@ -140,7 +140,7 @@ ComboBox { ...@@ -140,7 +140,7 @@ ComboBox {
} }
background: Rectangle { background: Rectangle {
id: rootItemBackground id: background
implicitWidth: root.width implicitWidth: root.width
implicitHeight: root.height implicitHeight: root.height
...@@ -156,6 +156,37 @@ ComboBox { ...@@ -156,6 +156,37 @@ ComboBox {
} }
color: JamiTheme.tabbarBorderColor color: JamiTheme.tabbarBorderColor
} }
states: [
State {
name: "open"; when: comboBoxPopup.opened
PropertyChanges {
target: background
color: Qt.lighter(JamiTheme.hoverColor, 1.0)
}
},
State {
name: "hovered"
PropertyChanges {
target: background
color: Qt.lighter(JamiTheme.hoverColor, 1.05)
}
},
State {
name: "normal"
PropertyChanges {
target: background
color: JamiTheme.backgroundColor
}
}
]
transitions: [
Transition {
to: "hovered"; reversible: true
ColorAnimation { duration: JamiTheme.fadeDuration }
}
]
} }
MouseArea { MouseArea {
...@@ -171,17 +202,23 @@ ComboBox { ...@@ -171,17 +202,23 @@ ComboBox {
root.popup.open() root.popup.open()
} }
} }
onEntered: rootItemBackground.color = Qt.lighter(JamiTheme.hoverColor, 1.05) onEntered: background.state = "hovered"
onExited: rootItemBackground.color = JamiTheme.backgroundColor onExited: {
if (!comboBoxPopup.opened)
background.state = "normal"
}
} }
PushButton { Row {
id: qrCodeGenerateButton spacing: 10
anchors.right: settingsButton.left anchors.right: root.right
anchors.rightMargin: 10 anchors.rightMargin: 10
anchors.verticalCenter: root.verticalCenter anchors.verticalCenter: root.verticalCenter
PushButton {
id: qrCodeGenerateButton
width: visible ? preferredSize : 0 width: visible ? preferredSize : 0
height: visible ? preferredSize : 0 height: visible ? preferredSize : 0
...@@ -199,10 +236,6 @@ ComboBox { ...@@ -199,10 +236,6 @@ ComboBox {
PushButton { PushButton {
id: settingsButton id: settingsButton
anchors.right: root.right
anchors.rightMargin: 10
anchors.verticalCenter: root.verticalCenter
source: !mainViewWindow.inSettingsView ? source: !mainViewWindow.inSettingsView ?
"qrc:/images/icons/round-settings-24px.svg" : "qrc:/images/icons/round-settings-24px.svg" :
"qrc:/images/icons/round-close-24px.svg" "qrc:/images/icons/round-close-24px.svg"
...@@ -213,10 +246,13 @@ ComboBox { ...@@ -213,10 +246,13 @@ ComboBox {
onClicked: { onClicked: {
settingBtnClicked() settingBtnClicked()
rootItemBackground.color = JamiTheme.backgroundColor background.state = "normal"
}
} }
} }
indicator: null indicator: null
// Overwrite the combo box pop up to add footer (for add accounts). // Overwrite the combo box pop up to add footer (for add accounts).
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment