b58c17b · unity8 · git.iko.soy

on xenial help sign in

fallback to 8 gus if we can't read or understand the env var

b58c17bMichael Zanetti10 years ago

src/SecondaryWindow.cpp+7−2

@@ -24,8 +24,13 @@

24SecondaryWindow::SecondaryWindow(QQmlEngine *engine)

25 : QQuickView(engine, nullptr)

26{

27− QByteArray pxpgu = qgetenv("GRID_UNIT_PX");

27+ QByteArray pxpguEnv = qgetenv("GRID_UNIT_PX");

28+ bool ok;

29+ int pxpgu = pxpguEnv.toInt(&ok);

30+ if (!ok) {

31+ pxpgu = 8;

32+ }

28− engine->rootContext()->setContextProperty("internalGu", pxpgu.toInt());

33+ engine->rootContext()->setContextProperty("internalGu", pxpgu);

29 setResizeMode(QQuickView::SizeRootObjectToView);

34 setResizeMode(QQuickView::SizeRootObjectToView);

30 setColor("black");

35 setColor("black");

31 setTitle(QStringLiteral("Unity8 Shell - Secondary Screen"));

36 setTitle(QStringLiteral("Unity8 Shell - Secondary Screen"));