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

Allow SetNextWindowPos() to affect tooltips.

Browse Source
This commit is contained in:
ocornut 2015-01-15 17:47:53 +00:00
parent 584c7ffac8
commit 2082487366
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
imgui.cpp
View File

@ -2311,11 +2311,13 @@ bool ImGui::Begin(const char* name, bool* p_opened, ImVec2 size, float fill_alph
g.CurrentWindow = window; g.CurrentWindow = window;
// Process SetNextWindow***() calls // Process SetNextWindow***() calls
bool window_pos_set_by_api = false;
if (g.SetNextWindowPosCond) if (g.SetNextWindowPosCond)
{ {
const ImVec2 backup_cursor_pos = window->DC.CursorPos; const ImVec2 backup_cursor_pos = window->DC.CursorPos;
ImGui::SetWindowPos(g.SetNextWindowPosVal, g.SetNextWindowPosCond); ImGui::SetWindowPos(g.SetNextWindowPosVal, g.SetNextWindowPosCond);
window->DC.CursorPos = backup_cursor_pos; window->DC.CursorPos = backup_cursor_pos;
window_pos_set_by_api = true;
g.SetNextWindowPosCond = 0; g.SetNextWindowPosCond = 0;
} }
if (g.SetNextWindowSizeCond) if (g.SetNextWindowSizeCond)
@ -2406,8 +2408,8 @@ bool ImGui::Begin(const char* name, bool* p_opened, ImVec2 size, float fill_alph
} }
} }
// Tooltips always follow mouse // Tooltips always follows mouse
if ((window->Flags & ImGuiWindowFlags_Tooltip) != 0) if (!window_pos_set_by_api && (window->Flags & ImGuiWindowFlags_Tooltip) != 0)
{ {
window->PosFloat = g.IO.MousePos + ImVec2(32,16) - style.FramePadding*2; window->PosFloat = g.IO.MousePos + ImVec2(32,16) - style.FramePadding*2;
} }
@ -2425,7 +2427,7 @@ bool ImGui::Begin(const char* name, bool* p_opened, ImVec2 size, float fill_alph
} }
window->Pos = ImVec2((float)(int)window->PosFloat.x, (float)(int)window->PosFloat.y); window->Pos = ImVec2((float)(int)window->PosFloat.x, (float)(int)window->PosFloat.y);
// Default item width // Default item width. Make it proportional to window size if window manually resizes
if (window->Size.x > 0.0f && !(window->Flags & ImGuiWindowFlags_Tooltip) && !(window->Flags & ImGuiWindowFlags_AlwaysAutoResize)) if (window->Size.x > 0.0f && !(window->Flags & ImGuiWindowFlags_Tooltip) && !(window->Flags & ImGuiWindowFlags_AlwaysAutoResize))
window->ItemWidthDefault = (float)(int)(window->Size.x * 0.65f); window->ItemWidthDefault = (float)(int)(window->Size.x * 0.65f);
else else
@ -2513,7 +2515,7 @@ bool ImGui::Begin(const char* name, bool* p_opened, ImVec2 size, float fill_alph
} }
else if (!(window->Flags & ImGuiWindowFlags_NoResize)) else if (!(window->Flags & ImGuiWindowFlags_NoResize))
{ {
// Resize grip // Manual resize grip
const ImGuiAabb resize_aabb(window->Aabb().GetBR()-ImVec2(18,18), window->Aabb().GetBR()); const ImGuiAabb resize_aabb(window->Aabb().GetBR()-ImVec2(18,18), window->Aabb().GetBR());
const ImGuiID resize_id = window->GetID("##RESIZE"); const ImGuiID resize_id = window->GetID("##RESIZE");
bool hovered, held; bool hovered, held;
@ -2522,7 +2524,7 @@ bool ImGui::Begin(const char* name, bool* p_opened, ImVec2 size, float fill_alph
if (g.HoveredWindow == window && held && g.IO.MouseDoubleClicked[0]) if (g.HoveredWindow == window && held && g.IO.MouseDoubleClicked[0])
{ {
// Manual auto-fit // Manual auto-fit when double-clicking
window->SizeFull = size_auto_fit; window->SizeFull = size_auto_fit;
window->Size = window->SizeFull; window->Size = window->SizeFull;
if (!(window->Flags & ImGuiWindowFlags_NoSavedSettings)) if (!(window->Flags & ImGuiWindowFlags_NoSavedSettings))
@ -2538,7 +2540,7 @@ bool ImGui::Begin(const char* name, bool* p_opened, ImVec2 size, float fill_alph
} }
} }
// Update aabb immediately so that the rendering below isn't one frame late // Update aabb immediately so that rendering right below us isn't one frame late
title_bar_aabb = window->TitleBarAabb(); title_bar_aabb = window->TitleBarAabb();
} }