From c3aa36d9ab6f7834ab0d197ff31920648e53652c Mon Sep 17 00:00:00 2001 From: ocornut Date: Sun, 24 Jul 2016 14:49:16 +0200 Subject: [PATCH] Navigation: Renamed ImGuiKey_NavWindowing to ImGuiKey_NavMenu (#323) --- imgui.cpp | 4 ++-- imgui.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index d37d3f02..aec8dac5 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -2364,7 +2364,7 @@ static void NavUpdate() } // Navigation windowing mode (change focus, move/resize window) - if (!g.NavWindowingTarget && g.NavWindow && IsKeyPressedMap(ImGuiKey_NavWindowing, false)) + if (!g.NavWindowingTarget && g.NavWindow && IsKeyPressedMap(ImGuiKey_NavMenu, false)) g.NavWindowingTarget = g.NavWindow->RootNonPopupWindow; if (g.NavWindowingTarget) { @@ -2390,7 +2390,7 @@ static void NavUpdate() } // Apply actual focus only when leaving NavWindowing mode (until then the window was merely rendered front-most) - if (!IsKeyDownMap(ImGuiKey_NavWindowing)) + if (!IsKeyDownMap(ImGuiKey_NavMenu)) { if (g.NavWindowingTarget) if (!g.FocusedWindow || (g.NavWindowingTarget->RootNonPopupWindow != g.FocusedWindow->RootNonPopupWindow)) diff --git a/imgui.h b/imgui.h index a415deec..a8569c32 100644 --- a/imgui.h +++ b/imgui.h @@ -599,7 +599,7 @@ enum ImGuiKey_ ImGuiKey_NavActivate, // press button, tweak value // e.g. Space key, Circle button ImGuiKey_NavCancel, // close menu/popup/child, unselect // e.g. Escape key, Cross button ImGuiKey_NavInput, // text input // e.g. Enter key, Triangle button - ImGuiKey_NavWindowing, // change focus, move, resize // e.g. Square button + ImGuiKey_NavMenu, // access menu, focus, move, resize // e.g. Square button ImGuiKey_NavLeft, // e.g. Left arrow, D-Pad left ImGuiKey_NavRight, // e.g. Right arrow, D-Pad right ImGuiKey_NavUp, // e.g. Up arrow, D-Pad up