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_NoSavedSettings flag + Fixed overlay example app.

Browse Source
This commit is contained in:
omar 2014-12-10 17:13:45 +00:00
parent 2a3bff9a82
commit 3399890a84
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
imgui.cpp
View File

@ -1340,7 +1340,7 @@ static void SaveSettings()
for (size_t i = 0; i != g.Windows.size(); i++) for (size_t i = 0; i != g.Windows.size(); i++)
{ {
ImGuiWindow* window = g.Windows[i]; ImGuiWindow* window = g.Windows[i];
if (window->Flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Tooltip)) if (window->Flags & ImGuiWindowFlags_NoSavedSettings)
continue; continue;
ImGuiIniData* settings = FindWindowSettings(window->Name); ImGuiIniData* settings = FindWindowSettings(window->Name);
settings->Pos = window->Pos; settings->Pos = window->Pos;
@ -2054,7 +2054,7 @@ static ImGuiWindow* FindWindow(const char* name)
void ImGui::BeginTooltip() void ImGui::BeginTooltip()
{ {
ImGui::Begin("##Tooltip", NULL, ImVec2(0,0), 0.9f, ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_Tooltip); ImGui::Begin("##Tooltip", NULL, ImVec2(0,0), 0.9f, ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_Tooltip);
} }
void ImGui::EndTooltip() void ImGui::EndTooltip()
@ -2068,7 +2068,7 @@ void ImGui::BeginChild(const char* str_id, ImVec2 size, bool border, ImGuiWindow
ImGuiState& g = GImGui; ImGuiState& g = GImGui;
ImGuiWindow* window = GetCurrentWindow(); ImGuiWindow* window = GetCurrentWindow();
ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_ChildWindow; ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_ChildWindow;
const ImVec2 content_max = window->Pos + ImGui::GetContentRegionMax(); const ImVec2 content_max = window->Pos + ImGui::GetContentRegionMax();
const ImVec2 cursor_pos = window->Pos + ImGui::GetCursorPos(); const ImVec2 cursor_pos = window->Pos + ImGui::GetCursorPos();
@ -2102,6 +2102,7 @@ void ImGui::EndChild()
{ {
ImGuiWindow* window = GetCurrentWindow(); ImGuiWindow* window = GetCurrentWindow();
IM_ASSERT(window->Flags & ImGuiWindowFlags_ChildWindow);
if (window->Flags & ImGuiWindowFlags_ComboBox) if (window->Flags & ImGuiWindowFlags_ComboBox)
{ {
ImGui::End(); ImGui::End();
@ -2130,8 +2131,8 @@ bool ImGui::Begin(const char* name, bool* open, ImVec2 size, float fill_alpha, I
ImGuiWindow* window = FindWindow(name); ImGuiWindow* window = FindWindow(name);
if (!window) if (!window)
{ {
// Create window the first time, and load settings // Create window the first time
if (flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Tooltip)) if (flags & ImGuiWindowFlags_NoSavedSettings)
{ {
// Tooltip and child windows don't store settings // Tooltip and child windows don't store settings
window = (ImGuiWindow*)ImGui::MemAlloc(sizeof(ImGuiWindow)); window = (ImGuiWindow*)ImGui::MemAlloc(sizeof(ImGuiWindow));
@ -6628,6 +6629,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); static void ShowExampleAppAutoResize(bool* open);
static void ShowExampleAppFixedOverlay(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)
@ -7139,11 +7141,13 @@ 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; static bool show_app_auto_resize = false;
static bool show_app_fixed_overlay = 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); ImGui::Checkbox("Auto-resizing window", &show_app_auto_resize);
ImGui::Checkbox("Simple overlay", &show_app_fixed_overlay);
} }
if (show_app_console) if (show_app_console)
ShowExampleAppConsole(&show_app_console); ShowExampleAppConsole(&show_app_console);
@ -7151,6 +7155,8 @@ void ImGui::ShowTestWindow(bool* open)
ShowExampleAppLongText(&show_app_long_text); ShowExampleAppLongText(&show_app_long_text);
if (show_app_auto_resize) if (show_app_auto_resize)
ShowExampleAppAutoResize(&show_app_auto_resize); ShowExampleAppAutoResize(&show_app_auto_resize);
if (show_app_fixed_overlay)
ShowExampleAppFixedOverlay(&show_app_fixed_overlay);
ImGui::End(); ImGui::End();
} }
@ -7172,6 +7178,22 @@ static void ShowExampleAppAutoResize(bool* open)
ImGui::End(); ImGui::End();
} }
static void ShowExampleAppFixedOverlay(bool* open)
{
if (!ImGui::Begin("Example: Fixed Overlay", open, ImVec2(0,0), 0.3f, ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoSavedSettings))
{
ImGui::End();
return;
}
ImGui::SetWindowPos(ImVec2(10,10));
ImGui::Text("Simple overlay\non the top-left side of the screen.");
ImGui::Separator();
ImGui::Text("Mouse Position: (%.1f,%.1f)", ImGui::GetIO().MousePos.x, ImGui::GetIO().MousePos.y);
ImGui::End();
}
struct ExampleAppConsole struct ExampleAppConsole
{ {
ImVector<char*> Items; ImVector<char*> Items;

11
imgui.h
View File

@ -312,11 +312,12 @@ enum ImGuiWindowFlags_
ImGuiWindowFlags_NoScrollbar = 1 << 4, ImGuiWindowFlags_NoScrollbar = 1 << 4,
ImGuiWindowFlags_NoScrollWithMouse = 1 << 5, ImGuiWindowFlags_NoScrollWithMouse = 1 << 5,
ImGuiWindowFlags_AlwaysAutoResize = 1 << 6, ImGuiWindowFlags_AlwaysAutoResize = 1 << 6,
ImGuiWindowFlags_ChildWindow = 1 << 7, // For internal use by BeginChild() ImGuiWindowFlags_NoSavedSettings = 1 << 7, // Never load/save settings in .ini file
ImGuiWindowFlags_ChildWindowAutoFitX = 1 << 8, // For internal use by BeginChild() ImGuiWindowFlags_ChildWindow = 1 << 8, // For internal use by BeginChild()
ImGuiWindowFlags_ChildWindowAutoFitY = 1 << 9, // For internal use by BeginChild() ImGuiWindowFlags_ChildWindowAutoFitX = 1 << 9, // For internal use by BeginChild()
ImGuiWindowFlags_ComboBox = 1 << 10, // For internal use by ComboBox() ImGuiWindowFlags_ChildWindowAutoFitY = 1 << 10, // For internal use by BeginChild()
ImGuiWindowFlags_Tooltip = 1 << 11 // For internal use by Render() when using Tooltip ImGuiWindowFlags_ComboBox = 1 << 11, // For internal use by ComboBox()
ImGuiWindowFlags_Tooltip = 1 << 12 // For internal use by Render() when using Tooltip
}; };
// Flags for ImGui::InputText() // Flags for ImGui::InputText()