History

updating artwork

Wayne Chen committed 7 years ago

Commit dc3381d1 parent 22bf4fc13 files · +44 −10Browse files

Showing the changes to interface/src/Application.cpp (1 of 13 files). Show all

Unified · Split

interface/src/Application.cpp+5−3
@@ -8178,9 +8178,9 @@ void Application::loadDomainConnectionDialog() { · 8177 unmodified lines
8178}8178}
8179 8179
8180void Application::toggleLogDialog() {8180void Application::toggleLogDialog() {
8181 if (getLoginDialogPoppedUp()) {8181 //if (getLoginDialogPoppedUp()) {
8182 return;8182 // return;
8183 }8183 //}
8184 if (! _logDialog) {8184 if (! _logDialog) {
8185 _logDialog = new LogDialog(nullptr, getLogger());8185 _logDialog = new LogDialog(nullptr, getLogger());
8186 }8186 }
@@ -8749,6 +8749,8 @@ void Application::createLoginDialogOverlay() { · 562 unmodified lines
8749 overlays.editOverlay(keyboard->getAnchorID(), properties);8749 overlays.editOverlay(keyboard->getAnchorID(), properties);
8750 keyboard->setResetKeyboardPositionOnRaise(false);8750 keyboard->setResetKeyboardPositionOnRaise(false);
8751 }8751 }
8752 auto loginDialogOverlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlays().getOverlay(_loginDialogOverlayID));
8753 loginDialogOverlay->setActiveFocus(true);
8752 getApplicationCompositor().getReticleInterface()->setAllowMouseCapture(false);8754 getApplicationCompositor().getReticleInterface()->setAllowMouseCapture(false);
8753 getApplicationCompositor().getReticleInterface()->setVisible(false);8755 getApplicationCompositor().getReticleInterface()->setVisible(false);
8754 if (!_loginStateManager.isSetUp()) {8756 if (!_loginStateManager.isSetUp()) {