diff options
author | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2018-08-08 14:38:03 +0900 |
---|---|---|
committer | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2018-08-08 14:41:13 +0900 |
commit | 58ecf2c3229ab677ca39095b52ab88b1a41861bd (patch) | |
tree | dd9ec6ec0bb49826746d942ee59322262e54c835 /homescreen/src/main.cpp | |
parent | 4d66f9362b74500b1ceb1850c156cd7aeaf60fc6 (diff) |
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 <mporter@konsulko.com>Y
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Diffstat (limited to 'homescreen/src/main.cpp')
-rw-r--r-- | homescreen/src/main.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
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<QQuickWindow *>(root); QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface())); + QList<QObject *> sobjs = engine.rootObjects(); + StatusBarModel *statusBar = sobjs.first()->findChild<StatusBarModel *>("statusBar"); + statusBar->init(bindingAddress, engine.rootContext()); + return a.exec(); } |