Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 04:37:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11187 from zfox23/context_removeWhenDeleting

Browse source 
Remove context overlay (if present) when removing entity
This commit is contained in:
Zach Fox 2017-08-14 15:06:20 -07:00 committed by GitHub
commit ee4a07b10d
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -55,6 +55,8 @@ ContextOverlayInterface::ContextOverlayInterface() {
_contextOverlayJustClicked = false; _contextOverlayJustClicked = false;
} }
}); });
auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>().data();
connect(entityScriptingInterface, &EntityScriptingInterface::deletingEntity, this, &ContextOverlayInterface::deletingEntity);
} }
static const uint32_t LEFT_HAND_HW_ID = 1; static const uint32_t LEFT_HAND_HW_ID = 1;
@ -278,3 +280,9 @@ void ContextOverlayInterface::disableEntityHighlight(const EntityItemID& entityI
} }
}); });
} }
void ContextOverlayInterface::deletingEntity(const EntityItemID& entityID) {
if (_currentEntityWithContextOverlay == entityID) {
destroyContextOverlay(_currentEntityWithContextOverlay, PointerEvent());
}
}

1
interface/src/ui/overlays/ContextOverlayInterface.h
View file

@ -80,6 +80,7 @@ private:
void enableEntityHighlight(const EntityItemID& entityItemID); void enableEntityHighlight(const EntityItemID& entityItemID);
void disableEntityHighlight(const EntityItemID& entityItemID); void disableEntityHighlight(const EntityItemID& entityItemID);
void deletingEntity(const EntityItemID& entityItemID);
}; };
#endif // hifi_ContextOverlayInterface_h #endif // hifi_ContextOverlayInterface_h