|
@@ -13649,7 +13649,7 @@ static void ImGui::NavUpdateWindowing()
|
|
|
|
|
|
// Start CTRL+Tab or Square+L/R window selection
|
|
|
// (g.ConfigNavWindowingKeyNext/g.ConfigNavWindowingKeyPrev defaults are ImGuiMod_Ctrl|ImGuiKey_Tab and ImGuiMod_Ctrl|ImGuiMod_Shift|ImGuiKey_Tab)
|
|
|
- const ImGuiID owner_id = ImHashStr("###NavUpdateWindowing");
|
|
|
+ const ImGuiID owner_id = ImHashStr("##NavUpdateWindowing");
|
|
|
const bool nav_gamepad_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) != 0 && (io.BackendFlags & ImGuiBackendFlags_HasGamepad) != 0;
|
|
|
const bool nav_keyboard_active = (io.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0;
|
|
|
const bool keyboard_next_window = allow_windowing && g.ConfigNavWindowingKeyNext && Shortcut(g.ConfigNavWindowingKeyNext, ImGuiInputFlags_Repeat | ImGuiInputFlags_RouteAlways, owner_id);
|
|
@@ -13849,12 +13849,12 @@ void ImGui::NavUpdateWindowingOverlay()
|
|
|
return;
|
|
|
|
|
|
if (g.NavWindowingListWindow == NULL)
|
|
|
- g.NavWindowingListWindow = FindWindowByName("###NavWindowingList");
|
|
|
+ g.NavWindowingListWindow = FindWindowByName("##NavWindowingOverlay");
|
|
|
const ImGuiViewport* viewport = GetMainViewport();
|
|
|
SetNextWindowSizeConstraints(ImVec2(viewport->Size.x * 0.20f, viewport->Size.y * 0.20f), ImVec2(FLT_MAX, FLT_MAX));
|
|
|
SetNextWindowPos(viewport->GetCenter(), ImGuiCond_Always, ImVec2(0.5f, 0.5f));
|
|
|
PushStyleVar(ImGuiStyleVar_WindowPadding, g.Style.WindowPadding * 2.0f);
|
|
|
- Begin("###NavWindowingList", NULL, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings);
|
|
|
+ Begin("##NavWindowingOverlay", NULL, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings);
|
|
|
if (g.ContextName[0] != 0)
|
|
|
SeparatorText(g.ContextName);
|
|
|
for (int n = g.WindowsFocusOrder.Size - 1; n >= 0; n--)
|