AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into qt_migration

Browse source
This commit is contained in:
pokamest 2023-01-08 23:00:13 +00:00
commit 167d3caa5d
47 changed files with 1061 additions and 876 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/ui/qml/Pages/PageGeneralSettings.qml
View file

@ -16,20 +16,12 @@ PageBase {
z: -1
}
Flickable {
FlickableType {
id: fl
width: root.width
anchors.top: back.bottom
anchors.topMargin: 0
anchors.bottom: root.bottom
anchors.bottomMargin: 10
anchors.left: root.left
anchors.leftMargin: 30
anchors.right: root.right
anchors.rightMargin: 30
contentHeight: content.height
clip: true
ColumnLayout {
id: content
@ -38,6 +30,7 @@ PageBase {
anchors.topMargin: 10
anchors.left: parent.left
anchors.right: parent.right
anchors.rightMargin: GC.defaultMargin
spacing: 15