on xenial help sign in
fallback to 8 gus if we can't read or understand the env var
commitb58c17b8ec03a81c575683bf38a81c69a25d5bb8 authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 22 Apr 2016, 15:10 (10 years ago) parent919186f
1 file changed+7−2
src/SecondaryWindow.cpp+7−2
src/SecondaryWindow.cpp+7−2
@@ -24,8 +24,13 @@
2424SecondaryWindow::SecondaryWindow(QQmlEngine *engine)
2525 : QQuickView(engine, nullptr)
2626{
27− QByteArray pxpgu = qgetenv("GRID_UNIT_PX");
28− engine->rootContext()->setContextProperty("internalGu", pxpgu.toInt());
27+ QByteArray pxpguEnv = qgetenv("GRID_UNIT_PX");
28+ bool ok;
29+ int pxpgu = pxpguEnv.toInt(&ok);
30+ if (!ok) {
31+ pxpgu = 8;
32+ }
33+ engine->rootContext()->setContextProperty("internalGu", pxpgu);
2934 setResizeMode(QQuickView::SizeRootObjectToView);
3035 setColor("black");
3136 setTitle(QStringLiteral("Unity8 Shell - Secondary Screen"));