Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-26 21:47:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Navigation: Renamed ImGuiKey_NavWindowing to ImGuiKey_NavMenu (#323)

Browse Source
This commit is contained in:
ocornut 2016-07-24 14:49:16 +02:00
parent 175f42420c
commit c3aa36d9ab
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imgui.cpp
View File

@ -2364,7 +2364,7 @@ static void NavUpdate()
} }
// Navigation windowing mode (change focus, move/resize window) // 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; g.NavWindowingTarget = g.NavWindow->RootNonPopupWindow;
if (g.NavWindowingTarget) 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) // 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.NavWindowingTarget)
if (!g.FocusedWindow || (g.NavWindowingTarget->RootNonPopupWindow != g.FocusedWindow->RootNonPopupWindow)) if (!g.FocusedWindow || (g.NavWindowingTarget->RootNonPopupWindow != g.FocusedWindow->RootNonPopupWindow))

2
imgui.h
View File

@ -599,7 +599,7 @@ enum ImGuiKey_
ImGuiKey_NavActivate, // press button, tweak value // e.g. Space key, Circle button 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_NavCancel, // close menu/popup/child, unselect // e.g. Escape key, Cross button
ImGuiKey_NavInput, // text input // e.g. Enter key, Triangle 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_NavLeft, // e.g. Left arrow, D-Pad left
ImGuiKey_NavRight, // e.g. Right arrow, D-Pad right ImGuiKey_NavRight, // e.g. Right arrow, D-Pad right
ImGuiKey_NavUp, // e.g. Up arrow, D-Pad up ImGuiKey_NavUp, // e.g. Up arrow, D-Pad up