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

Navigation: Allow to navigate out of text input with direction or NavCancel (#323)

Browse Source
This commit is contained in:
ocornut 2016-07-23 20:30:44 +02:00
parent 2f94563564
commit e9d8b48a4c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
imgui.cpp
View File

@ -2337,6 +2337,7 @@ static void NavUpdate()
{ {
// Apply result from previous navigation directional move request // Apply result from previous navigation directional move request
IM_ASSERT(g.NavWindow); IM_ASSERT(g.NavWindow);
ImGui::SetActiveID(0);
g.NavId = g.NavWindow->NavLastId = g.NavMoveResultBestId; g.NavId = g.NavWindow->NavLastId = g.NavMoveResultBestId;
g.NavRefRectRel = g.NavMoveResultBestRefRectRel; g.NavRefRectRel = g.NavMoveResultBestRefRectRel;
g.NavMousePosDirty = true; g.NavMousePosDirty = true;
@ -2387,11 +2388,15 @@ static void NavUpdate()
g.IO.NavActive = g.IO.NavUsable && g.NavId != 0 && !g.NavDisableHighlight; g.IO.NavActive = g.IO.NavUsable && g.NavId != 0 && !g.NavDisableHighlight;
// Process NavCancel input (to close a popup, get back to parent, clear focus) // Process NavCancel input (to close a popup, get back to parent, clear focus)
if (g.ActiveId == 0 && IsKeyPressedMap(ImGuiKey_NavCancel)) if (IsKeyPressedMap(ImGuiKey_NavCancel))
{ {
// Close open popup or move back to parent window if (g.ActiveId != 0)
if (g.OpenPopupStack.Size > 0)
{ {
ImGui::SetActiveID(0);
}
else if (g.OpenPopupStack.Size > 0)
{
// Close open popup or move back to parent window
ClosePopupToLevel(g.OpenPopupStack.Size - 1); ClosePopupToLevel(g.OpenPopupStack.Size - 1);
} }
else else
@ -6911,6 +6916,7 @@ bool ImGui::InputScalarAsWidgetReplacement(const ImRect& aabb, const char* label
// Our replacement widget will override the focus ID (registered previously to allow for a TAB focus to happen) // Our replacement widget will override the focus ID (registered previously to allow for a TAB focus to happen)
SetActiveIDNoNav(g.ScalarAsInputTextId, window); SetActiveIDNoNav(g.ScalarAsInputTextId, window);
g.ActiveIdAllowNavMove = true;
SetHoveredID(0); SetHoveredID(0);
FocusableItemUnregister(window); FocusableItemUnregister(window);
@ -8363,6 +8369,7 @@ bool ImGui::InputTextEx(const char* label, char* buf, int buf_size, const ImVec2
select_all = true; select_all = true;
} }
SetActiveID(id, window); SetActiveID(id, window);
g.ActiveIdAllowNavMove = true;
FocusWindow(window); FocusWindow(window);
} }
else if (io.MouseClicked[0]) else if (io.MouseClicked[0])