From 58ecf2c3229ab677ca39095b52ab88b1a41861bd Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Wed, 8 Aug 2018 14:38:03 +0900 Subject: Merge lastest commit from homescreen-2017 Merge two lastest commit from homescreen-2017. 1) StatusBarModel: fix QQmlContext reference Fix missing include Bug-AGL: SPEC-1628 2) Improve output of multiple screen resolution To improve output on various monitor with various resolution, use scale_factor from WM to fit various screen resolution. Bug-AGL: SPEC-1568, SPEC-1569, SPEC-1611 Change-Id: I71a6c87187c2b0b81bb0ed10cc8779032aa19300 Signed-off-by: Matt Porter Y Signed-off-by: Tadao Tanikawa Signed-off-by: zheng_wenlong --- homescreen/qml/StatusArea.qml | 2 +- homescreen/qml/main.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'homescreen/qml') diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml index 24d2b18..3f2b280 100644 --- a/homescreen/qml/StatusArea.qml +++ b/homescreen/qml/StatusArea.qml @@ -157,7 +157,7 @@ Item { } } Repeater { - model: StatusBarModel {} + model: StatusBarModel { objectName: "statusBar" } delegate: Image { Layout.preferredWidth: 77 Layout.preferredHeight: 73 diff --git a/homescreen/qml/main.qml b/homescreen/qml/main.qml index 1312e87..96a1950 100644 --- a/homescreen/qml/main.qml +++ b/homescreen/qml/main.qml @@ -32,7 +32,7 @@ Window { anchors.centerIn: parent width: 1080 height: 1920 - scale: 1.0 + scale: screenInfo.scale_factor() source: './images/AGL_HMI_Blue_Background_NoCar-01.png' ColumnLayout { -- cgit 1.2.3-korg