anulax
/
imgui-docking
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Nav: quick tap on NavMenu with no focused window doesn't focus one (holding still does) (#323)

Browse Source
features/sdl_renderer3_multiviewports
ocornut ago%!(EXTRA string=9 years)
parent e9c881e4de
commit 8b190f1100
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      imgui.cpp

4
imgui.cpp
Unescape View File

@ -2501,7 +2501,7 @@ static void NavUpdate()
if (!IsKeyDownMap(ImGuiKey_NavMenu)) if (!IsKeyDownMap(ImGuiKey_NavMenu))
{ {
// Apply actual focus only when releasing the NavMenu button (until then the window was merely rendered front-most) // Apply actual focus only when releasing the NavMenu button (until then the window was merely rendered front-most)
if (g.NavWindowingTarget && (!g.NavWindow || g.NavWindowingTarget != g.NavWindow->RootNonPopupWindow)) if (g.NavWindowingTarget && !g.NavWindowingToggleLayer && (!g.NavWindow || g.NavWindowingTarget != g.NavWindow->RootNonPopupWindow))
{ {
ImGui::FocusWindow(g.NavWindowingTarget); ImGui::FocusWindow(g.NavWindowingTarget);
g.NavDisableHighlight = false; g.NavDisableHighlight = false;
@ -2511,7 +2511,7 @@ static void NavUpdate()
} }
// Single press toggles NavLayer // Single press toggles NavLayer
if (g.NavWindowingToggleLayer) if (g.NavWindowingToggleLayer && g.NavWindow)
{ {
if ((g.NavWindow->DC.NavLayerActiveFlags & (1<<1)) == 0 && (g.NavWindow->RootWindow->DC.NavLayerActiveFlags & (1<<1)) != 0) if ((g.NavWindow->DC.NavLayerActiveFlags & (1<<1)) == 0 && (g.NavWindow->RootWindow->DC.NavLayerActiveFlags & (1<<1)) != 0)
ImGui::FocusWindow(g.NavWindow->RootWindow); ImGui::FocusWindow(g.NavWindow->RootWindow);

Write Preview
Loading…
Cancel
Save