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

Settings: Internal renaming of structure and fields names.

Browse Source
This commit is contained in:
omar 2017-11-27 23:00:27 +01:00
parent ade09b9e3c
commit d552cabd15
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
imgui.cpp
View File

@ -643,8 +643,9 @@ static void AddDrawListToRenderList(ImVector<ImDrawList*>& out_rende
static void AddWindowToRenderList(ImVector<ImDrawList*>& out_render_list, ImGuiWindow* window); static void AddWindowToRenderList(ImVector<ImDrawList*>& out_render_list, ImGuiWindow* window);
static void AddWindowToSortedBuffer(ImVector<ImGuiWindow*>& out_sorted_windows, ImGuiWindow* window); static void AddWindowToSortedBuffer(ImVector<ImGuiWindow*>& out_sorted_windows, ImGuiWindow* window);
static ImGuiIniData* FindWindowSettings(const char* name); static ImGuiSettingsWindow* FindWindowSettings(const char* name);
static ImGuiIniData* AddWindowSettings(const char* name); static ImGuiSettingsWindow* AddWindowSettings(const char* name);
static void LoadIniSettingsFromDisk(const char* ini_filename); static void LoadIniSettingsFromDisk(const char* ini_filename);
static void LoadIniSettingsFromMemory(const char* buf, const char* buf_end = NULL); static void LoadIniSettingsFromMemory(const char* buf, const char* buf_end = NULL);
static void SaveIniSettingsToDisk(const char* ini_filename); static void SaveIniSettingsToDisk(const char* ini_filename);
@ -2468,7 +2469,7 @@ void ImGui::Initialize()
g.LogClipboard = (ImGuiTextBuffer*)ImGui::MemAlloc(sizeof(ImGuiTextBuffer)); g.LogClipboard = (ImGuiTextBuffer*)ImGui::MemAlloc(sizeof(ImGuiTextBuffer));
IM_PLACEMENT_NEW(g.LogClipboard) ImGuiTextBuffer(); IM_PLACEMENT_NEW(g.LogClipboard) ImGuiTextBuffer();
IM_ASSERT(g.Settings.empty()); IM_ASSERT(g.SettingsWindows.empty());
LoadIniSettingsFromDisk(g.IO.IniFilename); LoadIniSettingsFromDisk(g.IO.IniFilename);
g.Initialized = true; g.Initialized = true;
} }
@ -2503,9 +2504,9 @@ void ImGui::Shutdown()
g.HoveredRootWindow = NULL; g.HoveredRootWindow = NULL;
g.ActiveIdWindow = NULL; g.ActiveIdWindow = NULL;
g.MovingWindow = NULL; g.MovingWindow = NULL;
for (int i = 0; i < g.Settings.Size; i++) for (int i = 0; i < g.SettingsWindows.Size; i++)
ImGui::MemFree(g.Settings[i].Name); ImGui::MemFree(g.SettingsWindows[i].Name);
g.Settings.clear(); g.SettingsWindows.clear();
g.ColorModifiers.clear(); g.ColorModifiers.clear();
g.StyleModifiers.clear(); g.StyleModifiers.clear();
g.FontStack.clear(); g.FontStack.clear();
@ -2535,29 +2536,30 @@ void ImGui::Shutdown()
g.Initialized = false; g.Initialized = false;
} }
static ImGuiIniData* FindWindowSettings(const char* name) static ImGuiSettingsWindow* FindWindowSettings(const char* name)
{ {
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
ImGuiID id = ImHash(name, 0); ImGuiID id = ImHash(name, 0);
for (int i = 0; i != g.Settings.Size; i++) for (int i = 0; i != g.SettingsWindows.Size; i++)
{ {
ImGuiIniData* ini = &g.Settings[i]; ImGuiSettingsWindow* ini = &g.SettingsWindows[i];
if (ini->Id == id) if (ini->Id == id)
return ini; return ini;
} }
return NULL; return NULL;
} }
static ImGuiIniData* AddWindowSettings(const char* name) static ImGuiSettingsWindow* AddWindowSettings(const char* name)
{ {
GImGui->Settings.resize(GImGui->Settings.Size + 1); ImGuiContext& g = *GImGui;
ImGuiIniData* ini = &GImGui->Settings.back(); g.SettingsWindows.resize(g.SettingsWindows.Size + 1);
ini->Name = ImStrdup(name); ImGuiSettingsWindow* settings = &g.SettingsWindows.back();
ini->Id = ImHash(name, 0); settings->Name = ImStrdup(name);
ini->Collapsed = false; settings->Id = ImHash(name, 0);
ini->Pos = ImVec2(FLT_MAX,FLT_MAX); settings->Collapsed = false;
ini->Size = ImVec2(0,0); settings->Pos = ImVec2(FLT_MAX,FLT_MAX);
return ini; settings->Size = ImVec2(0,0);
return settings;
} }
// Zero-tolerance, poor-man .ini parsing // Zero-tolerance, poor-man .ini parsing
@ -2579,7 +2581,7 @@ static void LoadIniSettingsFromMemory(const char* buf, const char* buf_end)
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
if (!buf_end) if (!buf_end)
buf_end = buf + strlen(buf); buf_end = buf + strlen(buf);
ImGuiIniData* settings = NULL; ImGuiSettingsWindow* settings = NULL;
for (const char* line_start = buf; line_start < buf_end; ) for (const char* line_start = buf; line_start < buf_end; )
{ {
const char* line_end = line_start; const char* line_end = line_start;
@ -2639,7 +2641,7 @@ static void SaveIniSettingsToMemory(ImVector<char>& out_buf)
ImGuiWindow* window = g.Windows[i]; ImGuiWindow* window = g.Windows[i];
if (window->Flags & ImGuiWindowFlags_NoSavedSettings) if (window->Flags & ImGuiWindowFlags_NoSavedSettings)
continue; continue;
ImGuiIniData* settings = FindWindowSettings(window->Name); ImGuiSettingsWindow* settings = FindWindowSettings(window->Name);
if (!settings) // This will only return NULL in the rare instance where the window was first created with ImGuiWindowFlags_NoSavedSettings then had the flag disabled later on. We don't bind settings in this case (bug #1000). if (!settings) // This will only return NULL in the rare instance where the window was first created with ImGuiWindowFlags_NoSavedSettings then had the flag disabled later on. We don't bind settings in this case (bug #1000).
continue; continue;
settings->Pos = window->Pos; settings->Pos = window->Pos;
@ -2650,10 +2652,10 @@ static void SaveIniSettingsToMemory(ImVector<char>& out_buf)
// Write a buffer // Write a buffer
// If a window wasn't opened in this session we preserve its settings // If a window wasn't opened in this session we preserve its settings
ImGuiTextBuffer buf; ImGuiTextBuffer buf;
buf.reserve(g.Settings.Size * 64); // ballpark reserve buf.reserve(g.SettingsWindows.Size * 64); // ballpark reserve
for (int i = 0; i != g.Settings.Size; i++) for (int i = 0; i != g.SettingsWindows.Size; i++)
{ {
const ImGuiIniData* settings = &g.Settings[i]; const ImGuiSettingsWindow* settings = &g.SettingsWindows[i];
if (settings->Pos.x == FLT_MAX) if (settings->Pos.x == FLT_MAX)
continue; continue;
const char* name = settings->Name; const char* name = settings->Name;
@ -4008,7 +4010,7 @@ static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFl
window->PosFloat = ImVec2(60, 60); window->PosFloat = ImVec2(60, 60);
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);
ImGuiIniData* settings = FindWindowSettings(name); ImGuiSettingsWindow* settings = FindWindowSettings(name);
if (!settings) if (!settings)
settings = AddWindowSettings(name); settings = AddWindowSettings(name);
else else

6
imgui_internal.h
View File

@ -38,7 +38,7 @@ struct ImGuiGroupData;
struct ImGuiSimpleColumns; struct ImGuiSimpleColumns;
struct ImGuiDrawContext; struct ImGuiDrawContext;
struct ImGuiTextEditState; struct ImGuiTextEditState;
struct ImGuiIniData; struct ImGuiSettingsWindow;
struct ImGuiMouseCursorData; struct ImGuiMouseCursorData;
struct ImGuiPopupRef; struct ImGuiPopupRef;
struct ImGuiWindow; struct ImGuiWindow;
@ -370,7 +370,7 @@ struct IMGUI_API ImGuiTextEditState
}; };
// Data saved in imgui.ini file // Data saved in imgui.ini file
struct ImGuiIniData struct ImGuiSettingsWindow
{ {
char* Name; char* Name;
ImGuiID Id; ImGuiID Id;
@ -438,7 +438,7 @@ struct ImGuiContext
ImGuiWindow* ActiveIdWindow; ImGuiWindow* ActiveIdWindow;
ImGuiWindow* MovingWindow; // Track the child window we clicked on to move a window. ImGuiWindow* MovingWindow; // Track the child window we clicked on to move a window.
ImGuiID MovingWindowMoveId; // == MovingWindow->MoveId ImGuiID MovingWindowMoveId; // == MovingWindow->MoveId
ImVector<ImGuiIniData> Settings; // .ini Settings ImVector<ImGuiSettingsWindow> SettingsWindows; // .ini Settings
float SettingsDirtyTimer; // Save .ini Settings on disk when time reaches zero float SettingsDirtyTimer; // Save .ini Settings on disk when time reaches zero
ImVector<ImGuiColMod> ColorModifiers; // Stack for PushStyleColor()/PopStyleColor() ImVector<ImGuiColMod> ColorModifiers; // Stack for PushStyleColor()/PopStyleColor()
ImVector<ImGuiStyleMod> StyleModifiers; // Stack for PushStyleVar()/PopStyleVar() ImVector<ImGuiStyleMod> StyleModifiers; // Stack for PushStyleVar()/PopStyleVar()