Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-14 08:42:59 +01:00
Code Releases Wiki Activity

AA branch: Fixed resize grip to scale better with non-default window rounding settings.

Browse Source
This commit is contained in:
ocornut 2015-03-07 00:01:02 +00:00
parent d69df3065f
commit 2b032004a9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
imgui.cpp
View File

@ -221,7 +221,6 @@
- misc: merge or clarify ImVec4 / ImGuiAabb, they are essentially duplicate containers - misc: merge or clarify ImVec4 / ImGuiAabb, they are essentially duplicate containers
- window: add horizontal scroll - window: add horizontal scroll
- window: fix resize grip rendering scaling along with Rounding style setting
- window: autofit feedback loop when user relies on any dynamic layout (window width multiplier, column). maybe just clearly drop manual autofit? - window: autofit feedback loop when user relies on any dynamic layout (window width multiplier, column). maybe just clearly drop manual autofit?
- window: add a way for very transient windows (non-saved, temporary overlay over hundreds of objects) to "clean" up from the global window list. - window: add a way for very transient windows (non-saved, temporary overlay over hundreds of objects) to "clean" up from the global window list.
- window: allow resizing of child windows (possibly given min/max for each axis?) - window: allow resizing of child windows (possibly given min/max for each axis?)
@ -3000,11 +2999,13 @@ bool ImGui::Begin(const char* name, bool* p_opened, const ImVec2& size, float bg
// (after the input handling so we don't have a frame of latency) // (after the input handling so we don't have a frame of latency)
if (!(window->Flags & ImGuiWindowFlags_NoResize)) if (!(window->Flags & ImGuiWindowFlags_NoResize))
{ {
const float r = window_rounding; const float base_size = window->FontSize() * 1.35f;
const float min_size = window_rounding + 1.0f + window->FontSize() * 0.2f;
const float corner_size = ImMax(base_size, min_size);
const ImVec2 br = window->Aabb().GetBR(); const ImVec2 br = window->Aabb().GetBR();
window->DrawList->LineTo(br + ImVec2(-2*r,0)); window->DrawList->LineTo(br + ImVec2(-corner_size, 0.0f));
window->DrawList->LineTo(br + ImVec2(0,-2*r)); window->DrawList->LineTo(br + ImVec2(0.0f, -corner_size));
window->DrawList->ArcToFast(ImVec2(br.x-r,br.y-r), r, 6, 9); window->DrawList->ArcToFast(ImVec2(br.x - window_rounding, br.y - window_rounding), window_rounding, 6, 9);
window->DrawList->Fill(resize_col); window->DrawList->Fill(resize_col);
} }
} }