mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-17 13:41:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'parent_visibility' into 'master'

Browse source 
Only restore focus to widgets with visible parents

Closes #5377

See merge request OpenMW/openmw!1364
This commit is contained in:
Alexei Kotov 2021-11-08 05:36:13 +00:00
commit a315af48e9
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -17,6 +17,7 @@
Bug #5100: Persuasion doesn't always clamp the resulting disposition Bug #5100: Persuasion doesn't always clamp the resulting disposition
Bug #5120: Scripted object spawning updates physics system Bug #5120: Scripted object spawning updates physics system
Bug #5207: Loose summons can be present in scene Bug #5207: Loose summons can be present in scene
Bug #5377: console does not appear after using menutest in inventory
Bug #5379: Wandering NPCs falling through cantons Bug #5379: Wandering NPCs falling through cantons
Bug #5453: Magic effect VFX are offset for creatures Bug #5453: Magic effect VFX are offset for creatures
Bug #5483: AutoCalc flag is not used to calculate spells cost Bug #5483: AutoCalc flag is not used to calculate spells cost

2
apps/openmw/mwgui/keyboardnavigation.cpp
View file

@ -79,7 +79,7 @@ void KeyboardNavigation::restoreFocus(int mode)
if (found != mKeyFocus.end()) if (found != mKeyFocus.end())
{ {
MyGUI::Widget* w = found->second; MyGUI::Widget* w = found->second;
if (w && w->getVisible() && w->getEnabled()) if (w && w->getVisible() && w->getEnabled() && w->getInheritedVisible() && w->getInheritedEnabled())
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(found->second); MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(found->second);
} }
} }