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/src/main.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'homescreen/src/main.cpp') diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 704bb9a..620c869 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) parser.addVersionOption(); parser.process(a); QStringList positionalArguments = parser.positionalArguments(); - + int port = 1700; QString token = "wm"; @@ -97,6 +97,8 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + AGLScreenInfo screenInfo(layoutHandler->get_scale_factor()); + if (layoutHandler->requestSurface(QString("HomeScreen")) != 0) { exit(EXIT_FAILURE); } @@ -136,11 +138,16 @@ int main(int argc, char *argv[]) engine.rootContext()->setContextProperty("launcher", launcher); engine.rootContext()->setContextProperty("weather", new Weather(bindingAddress)); engine.rootContext()->setContextProperty("bluetooth", new Bluetooth(bindingAddress)); + engine.rootContext()->setContextProperty("screenInfo", &screenInfo); engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); QObject *root = engine.rootObjects().first(); QQuickWindow *window = qobject_cast(root); QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface())); + QList sobjs = engine.rootObjects(); + StatusBarModel *statusBar = sobjs.first()->findChild("statusBar"); + statusBar->init(bindingAddress, engine.rootContext()); + return a.exec(); } -- cgit 1.2.3-korg