Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-04-14 15:13:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clicking on empty space in a child window set keyboard focus on the child window and move parent to front (#147)

Browse Source
This commit is contained in:
ocornut 2015-02-28 10:25:04 +00:00
parent 9b6fa29022
commit 4535644fcb
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
imgui.cpp
View File

@ -993,6 +993,7 @@ struct ImGuiState
ImGuiID ActiveIdPreviousFrame; ImGuiID ActiveIdPreviousFrame;
bool ActiveIdIsAlive; bool ActiveIdIsAlive;
bool ActiveIdIsFocusedOnly; // Set only by active widget. Denote focus but no active interaction. bool ActiveIdIsFocusedOnly; // Set only by active widget. Denote focus but no active interaction.
ImGuiWindow* MovedWindow; // Track the child window we clicked on to move a window. Only valid if ActiveID is the "#MOVE" identifier of a window.
float SettingsDirtyTimer; float SettingsDirtyTimer;
ImVector<ImGuiIniData*> Settings; ImVector<ImGuiIniData*> Settings;
ImVector<ImGuiColMod> ColorModifiers; ImVector<ImGuiColMod> ColorModifiers;
@ -1052,6 +1053,7 @@ struct ImGuiState
ActiveIdPreviousFrame = 0; ActiveIdPreviousFrame = 0;
ActiveIdIsAlive = false; ActiveIdIsAlive = false;
ActiveIdIsFocusedOnly = false; ActiveIdIsFocusedOnly = false;
MovedWindow = NULL;
SettingsDirtyTimer = 0.0f; SettingsDirtyTimer = 0.0f;
SetNextWindowPosVal = ImVec2(0.0f, 0.0f); SetNextWindowPosVal = ImVec2(0.0f, 0.0f);
@ -1767,6 +1769,8 @@ void ImGui::NewFrame()
SetActiveId(0); SetActiveId(0);
g.ActiveIdPreviousFrame = g.ActiveId; g.ActiveIdPreviousFrame = g.ActiveId;
g.ActiveIdIsAlive = false; g.ActiveIdIsAlive = false;
if (!g.ActiveId)
g.MovedWindow = NULL;
// Delay saving settings so we don't spam disk too much // Delay saving settings so we don't spam disk too much
if (g.SettingsDirtyTimer > 0.0f) if (g.SettingsDirtyTimer > 0.0f)
@ -1978,9 +1982,13 @@ void ImGui::Render()
g.CurrentWindow->Visible = false; g.CurrentWindow->Visible = false;
ImGui::End(); ImGui::End();
// Select window for move/focus when we're done with all our widgets (we only consider non-child windows here) // Select window for move/focus when we're done with all our widgets (we use the root window ID here)
if (g.ActiveId == 0 && g.HoveredId == 0 && g.HoveredRootWindow != NULL && g.IO.MouseClicked[0]) if (g.ActiveId == 0 && g.HoveredId == 0 && g.HoveredRootWindow != NULL && g.IO.MouseClicked[0])
{
IM_ASSERT(g.MovedWindow == NULL);
g.MovedWindow = g.HoveredWindow;
SetActiveId(g.HoveredRootWindow->GetID("#MOVE")); SetActiveId(g.HoveredRootWindow->GetID("#MOVE"));
}
// Sort the window list so that all child windows are after their parent // Sort the window list so that all child windows are after their parent
// We cannot do that on FocusWindow() because childs may not exist yet // We cannot do that on FocusWindow() because childs may not exist yet
@ -2787,11 +2795,13 @@ bool ImGui::Begin(const char* name, bool* p_opened, const ImVec2& size, float bg
if (!(window->Flags & ImGuiWindowFlags_NoSavedSettings)) if (!(window->Flags & ImGuiWindowFlags_NoSavedSettings))
MarkSettingsDirty(); MarkSettingsDirty();
} }
FocusWindow(window); IM_ASSERT(g.MovedWindow != NULL);
FocusWindow(g.MovedWindow);
} }
else else
{ {
SetActiveId(0); SetActiveId(0);
g.MovedWindow = NULL; // Not strictly necessary but doing it for sanity.
} }
} }
@ -3128,13 +3138,14 @@ static void FocusWindow(ImGuiWindow* window)
{ {
ImGuiState& g = *GImGui; ImGuiState& g = *GImGui;
// Always focus the root window // Always mark the window we passed as focused. This is used for keyboard interactions such as tabbing.
g.FocusedWindow = window;
// And move its root window to the top of the pile
// FIXME: RootWindow is set as we do Begin() on the window, so this won't work if called SetWindowFocus(const char* name) on a child window prior to window calling Begin(). Bit of an edge. // FIXME: RootWindow is set as we do Begin() on the window, so this won't work if called SetWindowFocus(const char* name) on a child window prior to window calling Begin(). Bit of an edge.
if (window->RootWindow) if (window->RootWindow)
window = window->RootWindow; window = window->RootWindow;
g.FocusedWindow = window;
if (g.Windows.back() == window) if (g.Windows.back() == window)
return; return;