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

Internals: Minor renaming for consistency.

Browse Source
This commit is contained in:
omar 2018-08-05 18:13:24 +02:00
parent 9e9c8a8991
commit 0905202f44
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imgui.cpp
View File

@ -2128,7 +2128,7 @@ ImGuiWindow::ImGuiWindow(ImGuiContext* context, const char* name)
Active = WasActive = false; Active = WasActive = false;
WriteAccessed = false; WriteAccessed = false;
Collapsed = false; Collapsed = false;
CollapseToggleWanted = false; WantCollapseToggle = false;
SkipItems = false; SkipItems = false;
Appearing = false; Appearing = false;
Hidden = false; Hidden = false;
@ -6407,8 +6407,8 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
// We don't use a regular button+id to test for double-click on title bar (mostly due to legacy reason, could be fixed), so verify that we don't have items over the title bar. // We don't use a regular button+id to test for double-click on title bar (mostly due to legacy reason, could be fixed), so verify that we don't have items over the title bar.
ImRect title_bar_rect = window->TitleBarRect(); ImRect title_bar_rect = window->TitleBarRect();
if (g.HoveredWindow == window && g.HoveredId == 0 && g.HoveredIdPreviousFrame == 0 && IsMouseHoveringRect(title_bar_rect.Min, title_bar_rect.Max) && g.IO.MouseDoubleClicked[0]) if (g.HoveredWindow == window && g.HoveredId == 0 && g.HoveredIdPreviousFrame == 0 && IsMouseHoveringRect(title_bar_rect.Min, title_bar_rect.Max) && g.IO.MouseDoubleClicked[0])
window->CollapseToggleWanted = true; window->WantCollapseToggle = true;
if (window->CollapseToggleWanted) if (window->WantCollapseToggle)
{ {
window->Collapsed = !window->Collapsed; window->Collapsed = !window->Collapsed;
MarkIniSettingsDirty(window); MarkIniSettingsDirty(window);
@ -6419,7 +6419,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
{ {
window->Collapsed = false; window->Collapsed = false;
} }
window->CollapseToggleWanted = false; window->WantCollapseToggle = false;
// SIZE // SIZE
@ -6729,7 +6729,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
// Collapse button // Collapse button
if (!(flags & ImGuiWindowFlags_NoCollapse)) if (!(flags & ImGuiWindowFlags_NoCollapse))
if (CollapseButton(window->GetID("#COLLAPSE"), window->Pos)) if (CollapseButton(window->GetID("#COLLAPSE"), window->Pos))
window->CollapseToggleWanted = true; // Defer collapsing to next frame as we are too far in the Begin() function window->WantCollapseToggle = true; // Defer collapsing to next frame as we are too far in the Begin() function
// Close button // Close button
if (p_open != NULL) if (p_open != NULL)

2
imgui_internal.h
View File

@ -983,7 +983,7 @@ struct IMGUI_API ImGuiWindow
bool WasActive; bool WasActive;
bool WriteAccessed; // Set to true when any widget access the current window bool WriteAccessed; // Set to true when any widget access the current window
bool Collapsed; // Set when collapsing window to become only title-bar bool Collapsed; // Set when collapsing window to become only title-bar
bool CollapseToggleWanted; bool WantCollapseToggle;
bool SkipItems; // Set when items can safely be all clipped (e.g. window not visible or collapsed) bool SkipItems; // Set when items can safely be all clipped (e.g. window not visible or collapsed)
bool Appearing; // Set during the frame where the window is appearing (or re-appearing) bool Appearing; // Set during the frame where the window is appearing (or re-appearing)
bool Hidden; // Do not display (== (HiddenFramesForResize > 0) || bool Hidden; // Do not display (== (HiddenFramesForResize > 0) ||