Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -5849,6 +5849,9 @@ void Application::setKeyboardFocusOverlay(const OverlayID& overlayID) { · 5848 unmodified lines | |||
| 5849 | _keyboardFocusHighlight->setVisible(false); | 5849 | _keyboardFocusHighlight->setVisible(false); |
| 5850 | } | 5850 | } |
| 5851 | } | 5851 | } |
| 5852 | if (overlayID == _loginDialogOverlayID) { | ||
| 5853 | emit loginDialogFocusEnabled(); | ||
| 5854 | } | ||
| 5852 | } | 5855 | } |
| 5853 | } | 5856 | } |
| 5854 | 5857 | ||
| @@ -8178,9 +8181,9 @@ void Application::loadDomainConnectionDialog() { · 2323 unmodified lines | |||
| 8178 | } | 8181 | } |
| 8179 | 8182 | ||
| 8180 | void Application::toggleLogDialog() { | 8183 | void Application::toggleLogDialog() { |
| 8181 | //if (getLoginDialogPoppedUp()) { | 8184 | if (getLoginDialogPoppedUp()) { |
| 8182 | // return; | 8185 | return; |
| 8183 | //} | 8186 | } |
| 8184 | if (! _logDialog) { | 8187 | if (! _logDialog) { |
| 8185 | _logDialog = new LogDialog(nullptr, getLogger()); | 8188 | _logDialog = new LogDialog(nullptr, getLogger()); |
| 8186 | } | 8189 | } |
| @@ -8749,8 +8752,7 @@ void Application::createLoginDialogOverlay() { · 562 unmodified lines | |||
| 8749 | overlays.editOverlay(keyboard->getAnchorID(), properties); | 8752 | overlays.editOverlay(keyboard->getAnchorID(), properties); |
| 8750 | keyboard->setResetKeyboardPositionOnRaise(false); | 8753 | keyboard->setResetKeyboardPositionOnRaise(false); |
| 8751 | } | 8754 | } |
| 8752 | auto loginDialogOverlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlays().getOverlay(_loginDialogOverlayID)); | 8755 | setKeyboardFocusOverlay(_loginDialogOverlayID); |
| 8753 | loginDialogOverlay->setActiveFocus(true); | ||
| 8754 | getApplicationCompositor().getReticleInterface()->setAllowMouseCapture(false); | 8756 | getApplicationCompositor().getReticleInterface()->setAllowMouseCapture(false); |
| 8755 | getApplicationCompositor().getReticleInterface()->setVisible(false); | 8757 | getApplicationCompositor().getReticleInterface()->setVisible(false); |
| 8756 | if (!_loginStateManager.isSetUp()) { | 8758 | if (!_loginStateManager.isSetUp()) { |