diff options
| author | Papoteur <papoteur@mageia.org> | 2019-05-22 08:46:34 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageia.org> | 2019-05-22 08:46:34 +0200 |
| commit | ad31b7cc930a5063a4038fdcdba92575a688f0b2 (patch) | |
| tree | 6db71dbf55729b40d99bfc82f926eec6becb5add /qml | |
| parent | 48190351d20052429b16f856c48625e2f2a4c851 (diff) | |
| parent | ce9156d427bdce4a94d99f885cb52cfd5fd4a8ec (diff) | |
| download | mageiawelcome-ad31b7cc930a5063a4038fdcdba92575a688f0b2.tar mageiawelcome-ad31b7cc930a5063a4038fdcdba92575a688f0b2.tar.gz mageiawelcome-ad31b7cc930a5063a4038fdcdba92575a688f0b2.tar.bz2 mageiawelcome-ad31b7cc930a5063a4038fdcdba92575a688f0b2.tar.xz mageiawelcome-ad31b7cc930a5063a4038fdcdba92575a688f0b2.zip | |
Merge branch 'master' into topic/mga6
Diffstat (limited to 'qml')
| -rw-r--r-- | qml/mageiawelcome.py | 4 | ||||
| -rw-r--r-- | qml/mw-ui.qml | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/qml/mageiawelcome.py b/qml/mageiawelcome.py index 6ae6caa..0af3612 100644 --- a/qml/mageiawelcome.py +++ b/qml/mageiawelcome.py @@ -191,8 +191,8 @@ if __name__ == '__main__': sc = nr.startupcheck() factor = cl.factor(app) screen = app.primaryScreen() - defaultHeight = 700 * factor - defaultWidth = 1000 * factor + defaultHeight = min(700 * factor, screen.availableGeometry().height()) + defaultWidth = min(1000 * factor, screen.availableGeometry().width()) centerPoint = screen.availableGeometry().center() view.setGeometry(centerPoint.x() -defaultWidth/2, centerPoint.y() - defaultHeight/2, defaultWidth,defaultHeight) view.rootContext().setContextProperty('link', cb) diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml index 40fa2e4..8a17530 100644 --- a/qml/mw-ui.qml +++ b/qml/mw-ui.qml @@ -11,14 +11,15 @@ import QtQuick.Dialogs 1.1 Rectangle { id: box - width: 1000 * Screen.devicePixelRatio; height: 650 * Screen.devicePixelRatio + //width: 1000 * Screen.devicePixelRatio; height: 650 * Screen.devicePixelRatio property alias view: view - //: For Right to Left language, set this string to RTL + //: For Right to Left language, set this string to RTL, else keep it untranslated property var direction: qsTr("LTR") LayoutMirroring.enabled: (direction == "LTR" ? false : true) // for tests //LayoutMirroring.enabled: true + // TO-DO GridLayout RowLayout are not sensible to mirroring, change to other layout tools LayoutMirroring.childrenInherit: true Settings { |