Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-06 13:32:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

splash screen to login page transititon

Browse source
This commit is contained in:
danteruiz 2019-08-30 09:10:47 -07:00
parent 255c3e4334
commit 3f865a430b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
launchers/qt/src/Launcher.cpp
View file

@ -11,7 +11,7 @@ Launcher::Launcher(int& argc, char**argv) : QGuiApplication(argc, argv) {
QString resourceBinaryLocation = QGuiApplication::applicationDirPath() + "/resources.rcc"; QString resourceBinaryLocation = QGuiApplication::applicationDirPath() + "/resources.rcc";
QResource::registerResource(resourceBinaryLocation); QResource::registerResource(resourceBinaryLocation);
_launcherState = std::make_shared<LauncherState>(); _launcherState = std::make_shared<LauncherState>();
_launcherState->setUIState(LauncherState::LOGIN_SCREEN); _launcherState->setUIState(LauncherState::SPLASH_SCREEN);
_launcherWindow = std::make_unique<LauncherWindow>(); _launcherWindow = std::make_unique<LauncherWindow>();
_launcherWindow->rootContext()->setContextProperty("LauncherState", _launcherState.get()); _launcherWindow->rootContext()->setContextProperty("LauncherState", _launcherState.get());
_launcherWindow->setFlags(Qt::FramelessWindowHint); _launcherWindow->setFlags(Qt::FramelessWindowHint);

2
launchers/qt/src/LauncherState.cpp
View file

@ -61,6 +61,7 @@ LauncherState::LauncherState() {
} }
} }
} }
setUIState(LauncherState::LOGIN_SCREEN);
}); });
} }
@ -74,6 +75,7 @@ void LauncherState::declareQML() {
void LauncherState::setUIState(UIState state) { void LauncherState::setUIState(UIState state) {
_uiState = state; _uiState = state;
emit updateSourceUrl(getCurrentUISource());
} }
LauncherState::UIState LauncherState::getUIState() const { LauncherState::UIState LauncherState::getUIState() const {