History

make login screen show up on the tablet on startup

Dante Ruiz committed 9 years ago

Commit f4255731 parent 8a678df3 files · +23 −5Browse files

Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 3 files). Show all

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+14−0
@@ -250,6 +250,15 @@ static QString getUsername() { · 249 unmodified lines
250250 }
251251 }
252252
253+void TabletProxy::initialScreen(const QVariant& url) {
254+ if (getQmlTablet()) {
255+ pushOntoStack(url);
256+ } else {
257+ _initialScreen = true;
258+ _initialPath = url;
259+ }
260+}
261+
253262 bool TabletProxy::isMessageDialogOpen() {
254263 if (_qmlTabletRoot) {
255264 QVariant result;
@@ -299,6 +308,11 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 43 unmodified lines
299308 QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername())));
300309 }
301310 });
311+
312+ if (_initialScreen) {
313+ pushOntoStack(_initialPath);
314+ _initialScreen = false;
315+ }
302316 } else {
303317 removeButtonsFromHomeScreen();
304318 _state = State::Uninitialized;