Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 09:18:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7580 from hyperlogic/tony/keyboard-focus-on-web-entity-fix

Browse source 
Application: focusOut keyboard device when clicking on web entity.
This commit is contained in:
Brad Hefta-Gaub 2016-04-05 18:44:30 -07:00
commit 699c717828
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -1007,6 +1007,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
RenderableWebEntityItem* webEntity = dynamic_cast<RenderableWebEntityItem*>(entity.get()); RenderableWebEntityItem* webEntity = dynamic_cast<RenderableWebEntityItem*>(entity.get());
if (webEntity) { if (webEntity) {
webEntity->setProxyWindow(_window->windowHandle()); webEntity->setProxyWindow(_window->windowHandle());
if (Menu::getInstance()->isOptionChecked(KeyboardMouseDevice::NAME)) {
_keyboardMouseDevice->pluginFocusOutEvent();
}
_keyboardFocusedItem = entityItemID; _keyboardFocusedItem = entityItemID;
_lastAcceptedKeyPress = usecTimestampNow(); _lastAcceptedKeyPress = usecTimestampNow();
if (_keyboardFocusHighlightID < 0 || !getOverlays().isAddedOverlay(_keyboardFocusHighlightID)) { if (_keyboardFocusHighlightID < 0 || !getOverlays().isAddedOverlay(_keyboardFocusHighlightID)) {