From 3f865a430b67a2ed29bc328ea932f1ab440b9a18 Mon Sep 17 00:00:00 2001 From: danteruiz Date: Fri, 30 Aug 2019 09:10:47 -0700 Subject: [PATCH] splash screen to login page transititon --- launchers/qt/src/Launcher.cpp | 2 +- launchers/qt/src/LauncherState.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/launchers/qt/src/Launcher.cpp b/launchers/qt/src/Launcher.cpp index 4c430e41ec..20405d5a39 100644 --- a/launchers/qt/src/Launcher.cpp +++ b/launchers/qt/src/Launcher.cpp @@ -11,7 +11,7 @@ Launcher::Launcher(int& argc, char**argv) : QGuiApplication(argc, argv) { QString resourceBinaryLocation = QGuiApplication::applicationDirPath() + "/resources.rcc"; QResource::registerResource(resourceBinaryLocation); _launcherState = std::make_shared(); - _launcherState->setUIState(LauncherState::LOGIN_SCREEN); + _launcherState->setUIState(LauncherState::SPLASH_SCREEN); _launcherWindow = std::make_unique(); _launcherWindow->rootContext()->setContextProperty("LauncherState", _launcherState.get()); _launcherWindow->setFlags(Qt::FramelessWindowHint); diff --git a/launchers/qt/src/LauncherState.cpp b/launchers/qt/src/LauncherState.cpp index 214f587d2c..52e13bc3b7 100644 --- a/launchers/qt/src/LauncherState.cpp +++ b/launchers/qt/src/LauncherState.cpp @@ -61,6 +61,7 @@ LauncherState::LauncherState() { } } } + setUIState(LauncherState::LOGIN_SCREEN); }); } @@ -74,6 +75,7 @@ void LauncherState::declareQML() { void LauncherState::setUIState(UIState state) { _uiState = state; + emit updateSourceUrl(getCurrentUISource()); } LauncherState::UIState LauncherState::getUIState() const {