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

another login fix

Browse source
This commit is contained in:
danteruiz 2019-02-28 17:11:48 -08:00
parent 0f0ed0fbc4
commit 9fe0309ae6
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -4980,10 +4980,11 @@ void Application::idle() {
} }
{ {
if (_keyboardFocusWaitingOnRenderable && getEntities()->renderableForEntityId(_keyboardFocusedEntity.get())) { if (_keyboardFocusWaitingOnRenderable && getEntities()->renderableForEntityId(_entityIdWaitingOnRenderable.get())) {
_keyboardFocusWaitingOnRenderable = false; QUuid entityId = _entityIdWaitingOnRenderable.get();
QUuid entityId = _keyboardFocusedEntity.get(); _entityIdWaitingOnRenderable.set(UNKNOWN_ENTITY_ID);
setKeyboardFocusEntity(UNKNOWN_ENTITY_ID); setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
_keyboardFocusWaitingOnRenderable = false;
setKeyboardFocusEntity(entityId); setKeyboardFocusEntity(entityId);
} }
} }
@ -5836,6 +5837,7 @@ 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,6 +733,7 @@ private:
bool _reticleClickPressed { false }; bool _reticleClickPressed { false };
bool _keyboardFocusWaitingOnRenderable { false }; bool _keyboardFocusWaitingOnRenderable { false };
ThreadSafeValueCache<EntityItemID> _entityIdWaitingOnRenderable;
int _avatarAttachmentRequest = 0; int _avatarAttachmentRequest = 0;