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(@desktop/profile): Fix slider controls in appearance settings 

Close #5809
This commit is contained in:
mishkarogachev 2022-05-20 13:51:44 +03:00 committed by Mikhail Rogachev
parent e2cdff1a98
commit dacacf6658
2 changed files with 5 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ

@ -1 +1 @@
Subproject commit 81cbab3f66480da7ba6b27ee433d4d4d43abde76
Subproject commit 07e711e30c4d1dd3f6677210a7b1335d7ae172d9

119
ui/app/AppLayouts/Profile/views/AppearanceView.qml
View File

@ -117,82 +117,17 @@ SettingsContentBase {
color: Theme.palette.directColor1
}
StatusQ.StatusSlider {
StatusQ.StatusLabeledSlider {
id: fontSizeSlider
anchors.top: labelFontSize.bottom
anchors.topMargin: Style.current.padding
width: parent.width
height: 40
from: 0
to: 5
stepSize: 1
model: [ qsTr("XS"), qsTr("S"), qsTr("M"), qsTr("L"), qsTr("XL"), qsTr("XXL") ]
value: localAccountSensitiveSettings.fontSize
onValueChanged: {
localAccountSensitiveSettings.fontSize = value
appearanceView.updateFontSize(value)
}
RowLayout {
id: fontSizeSliderLegend
anchors.bottom: parent.bottom
anchors.topMargin: Style.current.padding
anchors.left: parent.left
anchors.right: parent.right
spacing: Style.current.smallPadding
StatusBaseText {
font.pixelSize: 15
//% "XS"
text: qsTrId("xs")
Layout.preferredWidth: fontSizeSlider.width/6
color: Theme.palette.directColor1
}
StatusBaseText {
font.pixelSize: 15
//% "S"
text: qsTrId("s")
Layout.preferredWidth: fontSizeSlider.width/6
Layout.leftMargin: 2
color: Theme.palette.directColor1
}
StatusBaseText {
font.pixelSize: 15
//% "M"
text: qsTrId("m")
Layout.preferredWidth: fontSizeSlider.width/6
Layout.leftMargin: 2
color: Theme.palette.directColor1
}
StatusBaseText {
font.pixelSize: 15
//% "L"
text: qsTrId("l")
Layout.preferredWidth: fontSizeSlider.width/6
Layout.leftMargin: 2
color: Theme.palette.directColor1
}
StatusBaseText {
font.pixelSize: 15
//% "XL"
text: qsTrId("xl")
Layout.preferredWidth: fontSizeSlider.width/6
Layout.leftMargin: 0
color: Theme.palette.directColor1
}
StatusBaseText {
font.pixelSize: 15
//% "XXL"
text: qsTrId("xxl")
Layout.alignment: Qt.AlignRight
Layout.leftMargin: -Style.current.smallPadding
color: Theme.palette.directColor1
}
}
}
StatusBaseText {
@ -205,7 +140,7 @@ SettingsContentBase {
color: Theme.palette.directColor1
}
StatusQ.StatusSlider {
StatusQ.StatusLabeledSlider {
id: zoomSlider
readonly property int initialValue: {
let scaleFactorStr = appearanceView.appearanceStore.readTextFile(uiScaleFilePath)
@ -221,10 +156,10 @@ SettingsContentBase {
anchors.top: labelZoom.bottom
anchors.topMargin: Style.current.padding
width: parent.width
height: 40
from: 50
to: 200
stepSize: 50
model: [ qsTr("50%"), qsTr("100%"), qsTr("150%"), qsTr("200%") ]
value: initialValue
onValueChanged: {
if (value !== initialValue) {
@ -243,52 +178,6 @@ SettingsContentBase {
zoomSlider.value = zoomSlider.initialValue
}
}
RowLayout {
id: zoomSliderLegend
anchors.bottom: parent.bottom
anchors.topMargin: Style.current.padding
anchors.left: parent.left
anchors.right: parent.right
spacing: 0
StatusBaseText {
font.pixelSize: 15
text: "50%"
color: Theme.palette.directColor1
}
Item {
Layout.fillWidth: true
}
StatusBaseText {
font.pixelSize: 15
Layout.leftMargin: width / 2
text: "100%"
color: Theme.palette.directColor1
}
Item {
Layout.fillWidth: true
}
StatusBaseText {
font.pixelSize: 15
Layout.leftMargin: width / 2
text: "150%"
color: Theme.palette.directColor1
}
Item {
Layout.fillWidth: true
}
StatusBaseText {
font.pixelSize: 15
text: "200%"
color: Theme.palette.directColor1
}
}
}
StatusSectionHeadline {