Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-14 08:42:59 +01:00
Code Releases Wiki Activity

Navigation: can't manually focus out of a modal window with controller (#323)

Browse Source
This commit is contained in:
ocornut 2016-07-24 14:00:29 +02:00
parent 5cac4926c8
commit 49ec65b1b5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imgui.cpp
View File

@ -2370,9 +2370,9 @@ static void NavUpdate()
{ {
// FIXME-NAVIGATION: Need to clarify input semantic, naming is misleading/incorrect here. // FIXME-NAVIGATION: Need to clarify input semantic, naming is misleading/incorrect here.
int focus_change_dir = IsKeyPressedMap(ImGuiKey_NavTweakFaster, true) ? -1 : IsKeyPressedMap(ImGuiKey_NavTweakSlower, true) ? +1 : 0; int focus_change_dir = IsKeyPressedMap(ImGuiKey_NavTweakFaster, true) ? -1 : IsKeyPressedMap(ImGuiKey_NavTweakSlower, true) ? +1 : 0;
if (focus_change_dir != 0) if (focus_change_dir != 0 && !(g.NavWindowingTarget->Flags & ImGuiWindowFlags_Modal))
{ {
// FIXME-NAVIGATION FIXME-OPT: This is absolutely hideous and shouldn't stay. Pressed we should maintain a intrusive linked-list of visible windows. // FIXME-NAVIGATION FIXME-OPT: Code is absolutely hideous. Perhaps we should maintain a intrusive linked-list of visible windows.
int i_current = -1; int i_current = -1;
for (int i = g.Windows.Size-1; i >= 0 && i_current == -1; i--) for (int i = g.Windows.Size-1; i >= 0 && i_current == -1; i--)
if (g.Windows[i] == g.NavWindowingTarget) if (g.Windows[i] == g.NavWindowingTarget)