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

PushStyleColor/PushStyleVar can be used outside the scope of a window. Added 'count' parameter to PopStyleColor/PopStyleVar

Browse Source
This commit is contained in:
omar 2014-11-21 13:23:22 +00:00
parent 97192606a6
commit cf037b4769
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
imgui.cpp
View File

@ -624,8 +624,6 @@ struct ImGuiDrawContext
ImVector<bool> AllowKeyboardFocus; ImVector<bool> AllowKeyboardFocus;
ImVector<float> ItemWidth; ImVector<float> ItemWidth;
ImVector<float> TextWrapPos; ImVector<float> TextWrapPos;
ImVector<ImGuiColMod> ColorModifiers;
ImVector<ImGuiStyleMod> StyleModifiers;
ImGuiColorEditMode ColorEditMode; ImGuiColorEditMode ColorEditMode;
ImGuiStorage* StateStorage; ImGuiStorage* StateStorage;
int OpenNextNode; int OpenNextNode;
@ -734,6 +732,8 @@ struct ImGuiState
float SettingsDirtyTimer; float SettingsDirtyTimer;
ImVector<ImGuiIniData*> Settings; ImVector<ImGuiIniData*> Settings;
ImVec2 NewWindowDefaultPos; ImVec2 NewWindowDefaultPos;
ImVector<ImGuiColMod> ColorModifiers;
ImVector<ImGuiStyleMod> StyleModifiers;
// Render // Render
ImVector<ImDrawList*> RenderDrawLists; ImVector<ImDrawList*> RenderDrawLists;
@ -2366,8 +2366,6 @@ bool ImGui::Begin(const char* name, bool* open, ImVec2 size, float fill_alpha, I
window->DC.AllowKeyboardFocus.push_back(true); window->DC.AllowKeyboardFocus.push_back(true);
window->DC.TextWrapPos.resize(0); window->DC.TextWrapPos.resize(0);
window->DC.TextWrapPos.push_back(-1.0f); // disabled window->DC.TextWrapPos.push_back(-1.0f); // disabled
window->DC.ColorModifiers.resize(0);
window->DC.StyleModifiers.resize(0);
window->DC.ColorEditMode = ImGuiColorEditMode_UserSelect; window->DC.ColorEditMode = ImGuiColorEditMode_UserSelect;
window->DC.ColumnsCurrent = 0; window->DC.ColumnsCurrent = 0;
window->DC.ColumnsCount = 1; window->DC.ColumnsCount = 1;
@ -2549,23 +2547,25 @@ void ImGui::PopTextWrapPos()
void ImGui::PushStyleColor(ImGuiCol idx, const ImVec4& col) void ImGui::PushStyleColor(ImGuiCol idx, const ImVec4& col)
{ {
ImGuiState& g = GImGui; ImGuiState& g = GImGui;
ImGuiWindow* window = GetCurrentWindow();
ImGuiColMod backup; ImGuiColMod backup;
backup.Col = idx; backup.Col = idx;
backup.PreviousValue = g.Style.Colors[idx]; backup.PreviousValue = g.Style.Colors[idx];
window->DC.ColorModifiers.push_back(backup); g.ColorModifiers.push_back(backup);
g.Style.Colors[idx] = col; g.Style.Colors[idx] = col;
} }
void ImGui::PopStyleColor() void ImGui::PopStyleColor(int count)
{ {
ImGuiState& g = GImGui; ImGuiState& g = GImGui;
ImGuiWindow* window = GetCurrentWindow();
ImGuiColMod& backup = window->DC.ColorModifiers.back(); while (count > 0)
g.Style.Colors[backup.Col] = backup.PreviousValue; {
window->DC.ColorModifiers.pop_back(); ImGuiColMod& backup = g.ColorModifiers.back();
g.Style.Colors[backup.Col] = backup.PreviousValue;
g.ColorModifiers.pop_back();
count--;
}
} }
static float* GetStyleVarFloatAddr(ImGuiStyleVar idx) static float* GetStyleVarFloatAddr(ImGuiStyleVar idx)
@ -2595,41 +2595,44 @@ static ImVec2* GetStyleVarVec2Addr(ImGuiStyleVar idx)
void ImGui::PushStyleVar(ImGuiStyleVar idx, float val) void ImGui::PushStyleVar(ImGuiStyleVar idx, float val)
{ {
ImGuiWindow* window = GetCurrentWindow(); ImGuiState& g = GImGui;
float* pvar = GetStyleVarFloatAddr(idx); float* pvar = GetStyleVarFloatAddr(idx);
IM_ASSERT(pvar != NULL); // Called wrong function? IM_ASSERT(pvar != NULL); // Called wrong function?
ImGuiStyleMod backup; ImGuiStyleMod backup;
backup.Var = idx; backup.Var = idx;
backup.PreviousValue = ImVec2(*pvar, 0.0f); backup.PreviousValue = ImVec2(*pvar, 0.0f);
window->DC.StyleModifiers.push_back(backup); g.StyleModifiers.push_back(backup);
*pvar = val; *pvar = val;
} }
void ImGui::PushStyleVar(ImGuiStyleVar idx, const ImVec2& val) void ImGui::PushStyleVar(ImGuiStyleVar idx, const ImVec2& val)
{ {
ImGuiWindow* window = GetCurrentWindow(); ImGuiState& g = GImGui;
ImVec2* pvar = GetStyleVarVec2Addr(idx); ImVec2* pvar = GetStyleVarVec2Addr(idx);
IM_ASSERT(pvar != NULL); // Called wrong function? IM_ASSERT(pvar != NULL); // Called wrong function?
ImGuiStyleMod backup; ImGuiStyleMod backup;
backup.Var = idx; backup.Var = idx;
backup.PreviousValue = *pvar; backup.PreviousValue = *pvar;
window->DC.StyleModifiers.push_back(backup); g.StyleModifiers.push_back(backup);
*pvar = val; *pvar = val;
} }
void ImGui::PopStyleVar() void ImGui::PopStyleVar(int count)
{ {
ImGuiWindow* window = GetCurrentWindow(); ImGuiState& g = GImGui;
ImGuiStyleMod& backup = window->DC.StyleModifiers.back(); while (count > 0)
if (float* pvar_f = GetStyleVarFloatAddr(backup.Var)) {
*pvar_f = backup.PreviousValue.x; ImGuiStyleMod& backup = g.StyleModifiers.back();
else if (ImVec2* pvar_v = GetStyleVarVec2Addr(backup.Var)) if (float* pvar_f = GetStyleVarFloatAddr(backup.Var))
*pvar_v = backup.PreviousValue; *pvar_f = backup.PreviousValue.x;
window->DC.StyleModifiers.pop_back(); else if (ImVec2* pvar_v = GetStyleVarVec2Addr(backup.Var))
*pvar_v = backup.PreviousValue;
g.StyleModifiers.pop_back();
}
} }
const char* ImGui::GetStyleColorName(ImGuiCol idx) const char* ImGui::GetStyleColorName(ImGuiCol idx)

4
imgui.h
View File

@ -172,10 +172,10 @@ namespace ImGui
IMGUI_API void PushAllowKeyboardFocus(bool v); // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets. IMGUI_API void PushAllowKeyboardFocus(bool v); // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets.
IMGUI_API void PopAllowKeyboardFocus(); IMGUI_API void PopAllowKeyboardFocus();
IMGUI_API void PushStyleColor(ImGuiCol idx, const ImVec4& col); IMGUI_API void PushStyleColor(ImGuiCol idx, const ImVec4& col);
IMGUI_API void PopStyleColor(); IMGUI_API void PopStyleColor(int count = 1);
IMGUI_API void PushStyleVar(ImGuiStyleVar idx, float val); IMGUI_API void PushStyleVar(ImGuiStyleVar idx, float val);
IMGUI_API void PushStyleVar(ImGuiStyleVar idx, const ImVec2& val); IMGUI_API void PushStyleVar(ImGuiStyleVar idx, const ImVec2& val);
IMGUI_API void PopStyleVar(); IMGUI_API void PopStyleVar(int count = 1);
IMGUI_API void PushTextWrapPos(float wrap_pos_x = 0.0f); // word-wrapping for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space. IMGUI_API void PushTextWrapPos(float wrap_pos_x = 0.0f); // word-wrapping for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space.
IMGUI_API void PopTextWrapPos(); IMGUI_API void PopTextWrapPos();