status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(StatusSwitch): Colors adjusted when disabled, cursor shape fixed 

Closes: #9212
This commit is contained in:
Michał Cieślak 2023-01-20 14:44:47 +01:00 committed by Michał
parent 3136ffb54d
commit 14eb06b158
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ui/StatusQ/src/StatusQ/Controls/StatusSwitch.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.12
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
import StatusQ.Core 0.1
@ -6,18 +6,29 @@ import StatusQ.Core.Theme 0.1
import StatusQ.Components 0.1
Switch {
id: statusSwitch
id: root
indicator: Rectangle {
background: MouseArea {
cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
acceptedButtons: Qt.NoButton
}
indicator: Item {
id: oval
implicitWidth: 52
implicitHeight: 28
x: statusSwitch.leftPadding
x: root.leftPadding
y: parent.height / 2 - height / 2
radius: 14
color: statusSwitch.checked ? Theme.palette.primaryColor1
: Theme.palette.directColor8
Rectangle {
anchors.fill: parent
radius: 14
color: root.checked ? Theme.palette.primaryColor1
: Theme.palette.directColor8
opacity: root.enabled ? 1 : 0.2
}
Rectangle {
id: circle
@ -40,12 +51,12 @@ Switch {
states: [
State {
name: "on"
when: statusSwitch.checked
when: root.checked
PropertyChanges { target: circle; x: oval.width - circle.width - 4 }
},
State {
name: "off"
when: !statusSwitch.checked
when: !root.checked
PropertyChanges { target: circle; x: 4 }
}
]
@ -58,9 +69,10 @@ Switch {
}
contentItem: StatusBaseText {
text: statusSwitch.text
text: root.text
opacity: enabled ? 1.0 : 0.3
verticalAlignment: Text.AlignVCenter
leftPadding: !!statusSwitch.text ? statusSwitch.indicator.width + statusSwitch.spacing : statusSwitch.indicator.width
leftPadding: !!root.text ? root.indicator.width + root.spacing
: root.indicator.width
}
}