Merge branch 'dev' into qt_migration

2023-01-08 23:00:13 +00:00 · 2023-01-08 23:00:13 +00:00 · 167d3caa5d
commit 167d3caa5d
parent 3f257af7a9 3259e6f0e8
47 changed files with 1061 additions and 876 deletions
--- a/client/ui/qml/Config/GlobalConfig.qml
+++ b/client/ui/qml/Config/GlobalConfig.qml
@ -8,6 +8,8 @@ Item {
    readonly property int screenWidth: 380
    readonly property int screenHeight: 640

+    readonly property int defaultMargin: 20
+
    function isMobile() {
        if (Qt.platform.os == "android" ||
                Qt.platform.os == "ios") {