Nav, Popups: fixed context menu activation with gamepad erroneously testing for _NavEnableKeyboard instead of _NavEnableGamepad. (#9454)
cc: #8803, #9270
This commit is contained in:
parent
d15966ff6c
commit
b2377d616d
@ -74,6 +74,9 @@ Other Changes:
|
|||||||
calling ClearFonts() during rendering.
|
calling ClearFonts() during rendering.
|
||||||
- Fixed an issue where passing a manually created ImFontAtlas to CreateContext() would
|
- Fixed an issue where passing a manually created ImFontAtlas to CreateContext() would
|
||||||
incorrectly destroy it in DestroyContext() when ref-count gets back to zero. (#9426)
|
incorrectly destroy it in DestroyContext() when ref-count gets back to zero. (#9426)
|
||||||
|
- Nav:
|
||||||
|
- Fixed context menu activation with gamepad erroneously testing for _NavEnableKeyboard
|
||||||
|
instead of _NavEnableGamepad. (#9454, #8803, #9270) [@Clownacy]
|
||||||
- DrawList:
|
- DrawList:
|
||||||
- Minor optimization to `AddLine()`, `AddLineH()`, `AddLineV()` functions. (#4091)
|
- Minor optimization to `AddLine()`, `AddLineH()`, `AddLineV()` functions. (#4091)
|
||||||
- Added `ImDrawListFlags_TextNoPixelSnap` to disable snapping of AddText()
|
- Added `ImDrawListFlags_TextNoPixelSnap` to disable snapping of AddText()
|
||||||
|
|||||||
@ -14356,7 +14356,7 @@ static void ImGui::NavUpdateContextMenuRequest()
|
|||||||
ImGuiContext& g = *GImGui;
|
ImGuiContext& g = *GImGui;
|
||||||
g.NavOpenContextMenuItemId = g.NavOpenContextMenuWindowId = 0;
|
g.NavOpenContextMenuItemId = g.NavOpenContextMenuWindowId = 0;
|
||||||
const bool nav_keyboard_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0;
|
const bool nav_keyboard_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0;
|
||||||
const bool nav_gamepad_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard) != 0;
|
const bool nav_gamepad_active = (g.IO.ConfigFlags & ImGuiConfigFlags_NavEnableGamepad) != 0;
|
||||||
if ((!nav_keyboard_active && !nav_gamepad_active) || g.NavWindow == NULL)
|
if ((!nav_keyboard_active && !nav_gamepad_active) || g.NavWindow == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user