summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2018-08-02 13:11:33 +0000
committerTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2018-08-02 13:11:33 +0000
commitc647ed440383305e65b5c54eccf1ad356debd2e5 (patch)
tree86946437900c6a087063e7d06fe6c43b30cf81d7 /app
parent3c8498d95c3f89def2eb49b668fa70cd12faace7 (diff)
Improve output of multiple screen resolutionsandbox/ruke47/flounder_RPi3
To improve output on various monitor with various resolution, use scale_factor from WM to fit various screen resolution. Change-Id: I5ef4d54712e405744a9c9d2a369fbb2d0d31716d Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'app')
-rw-r--r--app/Mixer.qml34
-rw-r--r--app/main.cpp2
2 files changed, 24 insertions, 12 deletions
diff --git a/app/Mixer.qml b/app/Mixer.qml
index 0588b77..73587a5 100644
--- a/app/Mixer.qml
+++ b/app/Mixer.qml
@@ -28,6 +28,8 @@ ApplicationWindow {
// ----- Setup
id: root
+ width: container.width * container.scale
+ height: container.height * container.scale
// ----- Childs
Mixer {
@@ -93,19 +95,27 @@ ApplicationWindow {
}
}
- Label {
- id: title
- font.pixelSize: 48
- text: "Mixer"
- anchors.horizontalCenter: parent.horizontalCenter
- }
+ Item {
+ id: container
+ anchors.centerIn: parent
+ width: 1080
+ height: 1487
+ scale: screenInfo.scale_factor()
+
+ Label {
+ id: title
+ font.pixelSize: 48
+ text: "Mixer"
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
- ColumnLayout {
- id: sliders
- anchors.margins: 80
- anchors.top: title.bottom
- anchors.left: parent.left
- anchors.right: parent.right
+ ColumnLayout {
+ id: sliders
+ anchors.margins: 80
+ anchors.top: title.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ }
}
}
diff --git a/app/main.cpp b/app/main.cpp
index 52a0ff9..b8ef25a 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -81,6 +81,8 @@ int main(int argc, char *argv[])
if(qwm->init(port,secret) != 0){
exit(EXIT_FAILURE);
}
+ AGLScreenInfo screenInfo(qwm->get_scale_factor());
+ engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
// Request a surface as described in layers.json windowmanager’s file
if (qwm->requestSurface(myname) != 0) {
exit(EXIT_FAILURE);