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

review changes

Browse source
This commit is contained in:
danteruiz 2019-02-28 18:11:51 -08:00
parent 9fe0309ae6
commit 7bcf727a83
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -4980,9 +4980,8 @@ void Application::idle() {
} }
{ {
if (_keyboardFocusWaitingOnRenderable && getEntities()->renderableForEntityId(_entityIdWaitingOnRenderable.get())) { if (_keyboardFocusWaitingOnRenderable && getEntities()->renderableForEntityId(_keyboardFocusedEntity.get())) {
QUuid entityId = _entityIdWaitingOnRenderable.get(); QUuid entityId = _keyboardFocusedEntity.get();
_entityIdWaitingOnRenderable.set(UNKNOWN_ENTITY_ID);
setKeyboardFocusEntity(UNKNOWN_ENTITY_ID); setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
_keyboardFocusWaitingOnRenderable = false; _keyboardFocusWaitingOnRenderable = false;
setKeyboardFocusEntity(entityId); setKeyboardFocusEntity(entityId);
@ -5837,7 +5836,6 @@ void Application::setKeyboardFocusEntity(const QUuid& id) {
auto entityItemRenderable = entities->renderableForEntityId(entityId); auto entityItemRenderable = entities->renderableForEntityId(entityId);
if (!entityItemRenderable) { if (!entityItemRenderable) {
_keyboardFocusWaitingOnRenderable = true; _keyboardFocusWaitingOnRenderable = true;
_entityIdWaitingOnRenderable.set(id);
} else if (entityItemRenderable->wantsKeyboardFocus()) { } else if (entityItemRenderable->wantsKeyboardFocus()) {
entities->setProxyWindow(entityId, _window->windowHandle()); entities->setProxyWindow(entityId, _window->windowHandle());
if (_keyboardMouseDevice->isActive()) { if (_keyboardMouseDevice->isActive()) {

1
interface/src/Application.h
View file

@ -733,7 +733,6 @@ private:
bool _reticleClickPressed { false }; bool _reticleClickPressed { false };
bool _keyboardFocusWaitingOnRenderable { false }; bool _keyboardFocusWaitingOnRenderable { false };
ThreadSafeValueCache<EntityItemID> _entityIdWaitingOnRenderable;
int _avatarAttachmentRequest = 0; int _avatarAttachmentRequest = 0;