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

IT'S WORKING SOB SOB SOB

Browse source
This commit is contained in:
Zach Fox 2017-07-26 16:35:55 -07:00
parent 39cb0bc357
commit 8a7561d61b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,10 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
return true; return true;
} }
} else { } else {
return destroyContextOverlay(entityItemID, event); if (!_currentEntityWithContextOverlay.isNull()) {
return destroyContextOverlay(_currentEntityWithContextOverlay, event);
}
return false;
} }
return false; return false;
} }
@ -166,9 +169,7 @@ bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& ent
bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) { bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
if (_contextOverlayID != UNKNOWN_OVERLAY_ID) { if (_contextOverlayID != UNKNOWN_OVERLAY_ID) {
qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID; qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID;
if (!_currentEntityWithContextOverlay.isNull() && _currentEntityWithContextOverlay != entityItemID) { disableEntityHighlight(entityItemID);
disableEntityHighlight(_currentEntityWithContextOverlay);
}
setCurrentEntityWithContextOverlay(QUuid()); setCurrentEntityWithContextOverlay(QUuid());
_entityMarketplaceID.clear(); _entityMarketplaceID.clear();
// Destroy the Context Overlay // Destroy the Context Overlay

1
scripts/system/controllers/handControllerGrab.js
View file

@ -2246,7 +2246,6 @@ function MyController(hand) {
button: "None" button: "None"
}; };
if (rayPickInfo.entityID) { if (rayPickInfo.entityID) {
print("ZRF: " + hoveredEntityID);
if (hoveredEntityID !== rayPickInfo.entityID) { if (hoveredEntityID !== rayPickInfo.entityID) {
if (contextOverlayTimer) { if (contextOverlayTimer) {
Script.clearTimeout(contextOverlayTimer); Script.clearTimeout(contextOverlayTimer);