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

Added ImGuiWindowFlags_AlwaysAutoResize + example app. Calling SetWindowSize(0,0) force an autofit without zero-sizing first.

Browse Source
This commit is contained in:
omar 2014-11-21 16:29:56 +00:00
parent 2322318cac
commit 8c4fcf1359
2 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
imgui.cpp
View File

@ -1,4 +1,4 @@
// ImGui library v1.16 // ImGui library v1.17 wip
// See ImGui::ShowTestWindow() for sample code. // See ImGui::ShowTestWindow() for sample code.
// Read 'Programmer guide' below for notes on how to setup ImGui in your codebase. // Read 'Programmer guide' below for notes on how to setup ImGui in your codebase.
// Get latest version at https://github.com/ocornut/imgui // Get latest version at https://github.com/ocornut/imgui
@ -796,6 +796,7 @@ struct ImGuiWindow
bool Collapsed; // Set when collapsing window to become only title-bar bool Collapsed; // Set when collapsing window to become only title-bar
bool SkipItems; // == Visible && !Collapsed bool SkipItems; // == Visible && !Collapsed
int AutoFitFrames; int AutoFitFrames;
bool AutoFitOnlyGrows;
ImGuiDrawContext DC; ImGuiDrawContext DC;
ImVector<ImGuiID> IDStack; ImVector<ImGuiID> IDStack;
@ -1057,12 +1058,16 @@ ImGuiWindow::ImGuiWindow(const char* name, ImVec2 default_pos, ImVec2 default_si
Collapsed = false; Collapsed = false;
SkipItems = false; SkipItems = false;
AutoFitFrames = -1; AutoFitFrames = -1;
AutoFitOnlyGrows = false;
LastFrameDrawn = -1; LastFrameDrawn = -1;
ItemWidthDefault = 0.0f; ItemWidthDefault = 0.0f;
FontWindowScale = 1.0f; FontWindowScale = 1.0f;
if (ImLength(Size) < 0.001f) if (ImLength(Size) < 0.001f)
{
AutoFitFrames = 2; AutoFitFrames = 2;
AutoFitOnlyGrows = true;
}
DrawList = (ImDrawList*)ImGui::MemAlloc(sizeof(ImDrawList)); DrawList = (ImDrawList*)ImGui::MemAlloc(sizeof(ImDrawList));
new(DrawList) ImDrawList(); new(DrawList) ImDrawList();
@ -2108,6 +2113,7 @@ bool ImGui::Begin(const char* name, bool* open, ImVec2 size, float fill_alpha, I
{ {
// Hide for 1 frame while resizing // Hide for 1 frame while resizing
window->AutoFitFrames = 2; window->AutoFitFrames = 2;
window->AutoFitOnlyGrows = false;
window->Visible = false; window->Visible = false;
} }
} }
@ -2170,7 +2176,7 @@ bool ImGui::Begin(const char* name, bool* open, ImVec2 size, float fill_alpha, I
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
if (window->Size.x > 0.0f && !(window->Flags & ImGuiWindowFlags_Tooltip)) 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
window->ItemWidthDefault = 200.0f; window->ItemWidthDefault = 200.0f;
@ -2238,11 +2244,19 @@ bool ImGui::Begin(const char* name, bool* open, ImVec2 size, float fill_alpha, I
} }
else else
{ {
ImVec2 size_auto_fit = ImClamp(window->SizeContentsFit + style.AutoFitPadding, style.WindowMinSize, g.IO.DisplaySize - style.AutoFitPadding); const ImVec2 size_auto_fit = ImClamp(window->SizeContentsFit + style.AutoFitPadding, style.WindowMinSize, g.IO.DisplaySize - style.AutoFitPadding);
if (window->AutoFitFrames > 0) if ((window->Flags & ImGuiWindowFlags_AlwaysAutoResize) != 0)
{
// Don't continously mark settings as dirty, the size of the window doesn't need to be stored.
window->SizeFull = size_auto_fit;
}
else if (window->AutoFitFrames > 0)
{ {
// Auto-fit only grows during the first few frames // Auto-fit only grows during the first few frames
window->SizeFull = ImMax(window->SizeFull, size_auto_fit); if (window->AutoFitOnlyGrows)
window->SizeFull = ImMax(window->SizeFull, size_auto_fit);
else
window->SizeFull = size_auto_fit;
MarkSettingsDirty(); MarkSettingsDirty();
} }
else if (!(window->Flags & ImGuiWindowFlags_NoResize)) else if (!(window->Flags & ImGuiWindowFlags_NoResize))
@ -2633,7 +2647,7 @@ void ImGui::PopStyleVar(int count)
else if (ImVec2* pvar_v = GetStyleVarVec2Addr(backup.Var)) else if (ImVec2* pvar_v = GetStyleVarVec2Addr(backup.Var))
*pvar_v = backup.PreviousValue; *pvar_v = backup.PreviousValue;
g.StyleModifiers.pop_back(); g.StyleModifiers.pop_back();
count--; count--;
} }
} }
@ -2723,9 +2737,15 @@ ImVec2 ImGui::GetWindowSize()
void ImGui::SetWindowSize(const ImVec2& size) void ImGui::SetWindowSize(const ImVec2& size)
{ {
ImGuiWindow* window = GetCurrentWindow(); ImGuiWindow* window = GetCurrentWindow();
window->SizeFull = size;
if (ImLength(size) < 0.001f) if (ImLength(size) < 0.001f)
window->AutoFitFrames = 3; {
window->AutoFitFrames = 2;
window->AutoFitOnlyGrows = false;
}
else
{
window->SizeFull = size;
}
} }
ImVec2 ImGui::GetContentRegionMax() ImVec2 ImGui::GetContentRegionMax()
@ -6389,6 +6409,7 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
static void ShowExampleAppConsole(bool* open); static void ShowExampleAppConsole(bool* open);
static void ShowExampleAppLongText(bool* open); static void ShowExampleAppLongText(bool* open);
static void ShowExampleAppAutoResize(bool* open);
// Demonstrate ImGui features (unfortunately this makes this function a little bloated!) // Demonstrate ImGui features (unfortunately this makes this function a little bloated!)
void ImGui::ShowTestWindow(bool* open) void ImGui::ShowTestWindow(bool* open)
@ -6894,15 +6915,36 @@ void ImGui::ShowTestWindow(bool* open)
static bool show_app_console = false; static bool show_app_console = false;
static bool show_app_long_text = false; static bool show_app_long_text = false;
static bool show_app_auto_resize = false;
if (ImGui::CollapsingHeader("App Examples")) if (ImGui::CollapsingHeader("App Examples"))
{ {
ImGui::Checkbox("Console", &show_app_console); ImGui::Checkbox("Console", &show_app_console);
ImGui::Checkbox("Long text display", &show_app_long_text); ImGui::Checkbox("Long text display", &show_app_long_text);
ImGui::Checkbox("Auto-resizing window", &show_app_auto_resize);
} }
if (show_app_console) if (show_app_console)
ShowExampleAppConsole(&show_app_console); ShowExampleAppConsole(&show_app_console);
if (show_app_long_text) if (show_app_long_text)
ShowExampleAppLongText(&show_app_long_text); ShowExampleAppLongText(&show_app_long_text);
if (show_app_auto_resize)
ShowExampleAppAutoResize(&show_app_auto_resize);
ImGui::End();
}
static void ShowExampleAppAutoResize(bool* open)
{
if (!ImGui::Begin("Example: Auto-Resizing Window", open, ImVec2(0,0), -1.0f, ImGuiWindowFlags_AlwaysAutoResize))
{
ImGui::End();
return;
}
static int lines = 10;
ImGui::TextWrapped("Window will resize every-frame to the size of its content. Note that you don't want to query the window size to output your content because that would create a feedback loop.");
ImGui::SliderInt("Number of lines", &lines, 1, 20);
for (int i = 0; i < lines; i++)
ImGui::Text("%*sThis is line %d", i*4, "", i); // Pad with space to extend size horizontally
ImGui::End(); ImGui::End();
} }

13
imgui.h
View File

@ -1,4 +1,4 @@
// ImGui library v1.16 // ImGui library v1.17 wip
// See .cpp file for commentary. // See .cpp file for commentary.
// See ImGui::ShowTestWindow() for sample code. // See ImGui::ShowTestWindow() for sample code.
// Read 'Programmer guide' in .cpp for notes on how to setup ImGui in your codebase. // Read 'Programmer guide' in .cpp for notes on how to setup ImGui in your codebase.
@ -308,11 +308,12 @@ enum ImGuiWindowFlags_
ImGuiWindowFlags_NoResize = 1 << 2, ImGuiWindowFlags_NoResize = 1 << 2,
ImGuiWindowFlags_NoMove = 1 << 3, ImGuiWindowFlags_NoMove = 1 << 3,
ImGuiWindowFlags_NoScrollbar = 1 << 4, ImGuiWindowFlags_NoScrollbar = 1 << 4,
ImGuiWindowFlags_ChildWindow = 1 << 5, // For internal use by BeginChild() ImGuiWindowFlags_AlwaysAutoResize = 1 << 5,
ImGuiWindowFlags_ChildWindowAutoFitX = 1 << 6, // For internal use by BeginChild() ImGuiWindowFlags_ChildWindow = 1 << 6, // For internal use by BeginChild()
ImGuiWindowFlags_ChildWindowAutoFitY = 1 << 7, // For internal use by BeginChild() ImGuiWindowFlags_ChildWindowAutoFitX = 1 << 7, // For internal use by BeginChild()
ImGuiWindowFlags_ComboBox = 1 << 8, // For internal use by ComboBox() ImGuiWindowFlags_ChildWindowAutoFitY = 1 << 8, // For internal use by BeginChild()
ImGuiWindowFlags_Tooltip = 1 << 9 // For internal use by Render() when using Tooltip ImGuiWindowFlags_ComboBox = 1 << 9, // For internal use by ComboBox()
ImGuiWindowFlags_Tooltip = 1 << 10 // For internal use by Render() when using Tooltip
}; };
// Flags for ImGui::InputText() // Flags for ImGui::InputText()