Merge branch 'textfix' of cwtch.im/ui into master

This commit is contained in:
erinn 2019-02-12 21:24:14 +00:00 committed by Gogs
commit e86686f2f7
3 changed files with 4 additions and 3 deletions

View File

@ -114,7 +114,7 @@ Item {
color: "#D2C0DD"
Layout.fillHeight: true
Layout.minimumWidth: Layout.maximumWidth
Layout.maximumWidth: theStack.pane == theStack.emptyPane ? parent.width : 200
Layout.maximumWidth: theStack.pane == theStack.emptyPane ? parent.width : 450
visible: (ratio <= 1.08 && windowItem.width >= 500) || theStack.pane == theStack.emptyPane

View File

@ -25,6 +25,7 @@ ColumnLayout { // settingsPane
id: zoomSlider
from: 0.5
to: 2.4
value: 1
onValueChanged: {
gcd.themeScale = zoomSlider.value
}
@ -46,7 +47,7 @@ ColumnLayout { // settingsPane
Component.onCompleted: {
zoomSlider.value = Screen.pixelDensity / 3.2 // artistic license. set by erinn. fight me before changing
zoomSlider.value = 1 //Screen.pixelDensity / 3.2 // artistic license. set by erinn. fight me before changing
if (zoomSlider.value < zoomSlider.from) zoomSlider.value = zoomSlider.from
if (zoomSlider.value > zoomSlider.to) zoomSlider.value = zoomSlider.to
}

View File

@ -147,7 +147,7 @@ ColumnLayout {
Layout.fillWidth: true
padding: 3
horizontalAlignment: Text.AlignHCenter
text: "This is your address. You can give it out to people!\n" + onion
text:onion
}
Row { // TOOLS FOR EDITING PROFILE