Showing the changes to interface/src/Application.cpp (1 of 18 files). Show all
Unified · Split
| @@ -783,6 +783,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 782 unmodified lines | |||
| 783 | connect(&domainHandler, SIGNAL(connectedToDomain(const QString&)), SLOT(updateWindowTitle())); | 783 | connect(&domainHandler, SIGNAL(connectedToDomain(const QString&)), SLOT(updateWindowTitle())); |
| 784 | connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle())); | 784 | connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle())); |
| 785 | connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(clearDomainOctreeDetails())); | 785 | connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(clearDomainOctreeDetails())); |
| 786 | connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this]() { | ||
| 787 | getOverlays().deleteOverlay(getTabletScreenID()); | ||
| 788 | getOverlays().deleteOverlay(getTabletHomeButtonID()); | ||
| 789 | getOverlays().deleteOverlay(getTabletFrameID()); | ||
| 790 | }); | ||
| 786 | connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &Application::domainConnectionRefused); | 791 | connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &Application::domainConnectionRefused); |
| 787 | 792 | ||
| 788 | // We could clear ATP assets only when changing domains, but it's possible that the domain you are connected | 793 | // We could clear ATP assets only when changing domains, but it's possible that the domain you are connected |
| @@ -1221,6 +1226,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 432 unmodified lines | |||
| 1221 | if (entity && entity->wantsKeyboardFocus()) { | 1226 | if (entity && entity->wantsKeyboardFocus()) { |
| 1222 | setKeyboardFocusOverlay(UNKNOWN_OVERLAY_ID); | 1227 | setKeyboardFocusOverlay(UNKNOWN_OVERLAY_ID); |
| 1223 | setKeyboardFocusEntity(entityItemID); | 1228 | setKeyboardFocusEntity(entityItemID); |
| 1229 | } else { | ||
| 1230 | setKeyboardFocusEntity(UNKNOWN_ENTITY_ID); | ||
| 1224 | } | 1231 | } |
| 1225 | }); | 1232 | }); |
| 1226 | 1233 | ||