Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-10-31 21:21:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tidying up PushStyleVar/PopStyleVar() a little more (#842)

Browse Source
This commit is contained in:
ocornut
2016-09-25 11:14:10 +02:00
parent c5b8c6303a
commit 281898e82e
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
imgui.cpp
View File

@@ -4684,25 +4684,27 @@ static const ImGuiStyleVarInfo GStyleVarInfo[ImGuiStyleVar_Count_] =
{ ImGuiDataType_Float, (ImU32)IM_OFFSETOF(ImGuiStyle, GrabMinSize) }, { ImGuiDataType_Float, (ImU32)IM_OFFSETOF(ImGuiStyle, GrabMinSize) },
}; };
static const void* GetStyleVarPtr(ImGuiStyleVar idx, ImGuiDataType type) static const ImGuiStyleVarInfo* GetStyleVarInfo(ImGuiStyleVar idx)
{ {
IM_ASSERT(idx >= 0 && idx < ImGuiStyleVar_Count_); IM_ASSERT(idx >= 0 && idx < ImGuiStyleVar_Count_);
const ImGuiStyleVarInfo* info = &GStyleVarInfo[idx]; return &GStyleVarInfo[idx];
return (info->Type == type) ? info->GetVarPtr() : NULL;
} }
void ImGui::PushStyleVar(ImGuiStyleVar idx, int val) void ImGui::PushStyleVar(ImGuiStyleVar idx, int val)
{ {
if (int* pvar = (int*)GetStyleVarPtr(idx, ImGuiDataType_Int)) const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx);
if (var_info->Type == ImGuiDataType_Int)
{ {
int* pvar = (int*)var_info->GetVarPtr();
GImGui->StyleModifiers.push_back(ImGuiStyleMod(idx, *pvar)); GImGui->StyleModifiers.push_back(ImGuiStyleMod(idx, *pvar));
*pvar = val; *pvar = val;
return; return;
} }
if (float* pvarf = (float*)GetStyleVarPtr(idx, ImGuiDataType_Float)) if (var_info->Type == ImGuiDataType_Float)
{ {
GImGui->StyleModifiers.push_back(ImGuiStyleMod(idx, *pvarf)); float* pvar = (float*)var_info->GetVarPtr();
*pvarf = (float)val; GImGui->StyleModifiers.push_back(ImGuiStyleMod(idx, *pvar));
*pvar = (float)val;
return; return;
} }
IM_ASSERT(0); // Called function with wrong-type? Variable is not a int. IM_ASSERT(0); // Called function with wrong-type? Variable is not a int.
@@ -4710,8 +4712,10 @@ void ImGui::PushStyleVar(ImGuiStyleVar idx, int val)
void ImGui::PushStyleVar(ImGuiStyleVar idx, float val) void ImGui::PushStyleVar(ImGuiStyleVar idx, float val)
{ {
if (float* pvar = (float*)GetStyleVarPtr(idx, ImGuiDataType_Float)) const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx);
if (var_info->Type == ImGuiDataType_Float)
{ {
float* pvar = (float*)var_info->GetVarPtr();
GImGui->StyleModifiers.push_back(ImGuiStyleMod(idx, *pvar)); GImGui->StyleModifiers.push_back(ImGuiStyleMod(idx, *pvar));
*pvar = val; *pvar = val;
return; return;
@@ -4721,8 +4725,10 @@ void ImGui::PushStyleVar(ImGuiStyleVar idx, float val)
void ImGui::PushStyleVar(ImGuiStyleVar idx, const ImVec2& val) void ImGui::PushStyleVar(ImGuiStyleVar idx, const ImVec2& val)
{ {
if (ImVec2* pvar = (ImVec2*)GetStyleVarPtr(idx, ImGuiDataType_Float2)) const ImGuiStyleVarInfo* var_info = GetStyleVarInfo(idx);
if (var_info->Type == ImGuiDataType_Float2)
{ {
ImVec2* pvar = (ImVec2*)var_info->GetVarPtr();
GImGui->StyleModifiers.push_back(ImGuiStyleMod(idx, *pvar)); GImGui->StyleModifiers.push_back(ImGuiStyleMod(idx, *pvar));
*pvar = val; *pvar = val;
return; return;
@@ -4736,12 +4742,10 @@ void ImGui::PopStyleVar(int count)
while (count > 0) while (count > 0)
{ {
ImGuiStyleMod& backup = g.StyleModifiers.back(); ImGuiStyleMod& backup = g.StyleModifiers.back();
IM_ASSERT(backup.VarIdx >= 0 && backup.VarIdx < ImGuiStyleVar_Count_); const ImGuiStyleVarInfo* info = GetStyleVarInfo(backup.VarIdx);
const ImGuiStyleVarInfo* info = &GStyleVarInfo[backup.VarIdx]; if (info->Type == ImGuiDataType_Float) (*(float*)info->GetVarPtr()) = backup.BackupFloat[0];
void* pvar = info->GetVarPtr(); else if (info->Type == ImGuiDataType_Float2) (*(ImVec2*)info->GetVarPtr()) = ImVec2(backup.BackupFloat[0], backup.BackupFloat[1]);
if (info->Type == ImGuiDataType_Float) (*(float*)pvar) = backup.BackupFloat[0]; else if (info->Type == ImGuiDataType_Int) (*(int*)info->GetVarPtr()) = backup.BackupInt[0];
else if (info->Type == ImGuiDataType_Float2) (*(ImVec2*)pvar) = ImVec2(backup.BackupFloat[0], backup.BackupFloat[1]);
else if (info->Type == ImGuiDataType_Int) (*(int*)pvar) = backup.BackupInt[0];
g.StyleModifiers.pop_back(); g.StyleModifiers.pop_back();
count--; count--;
} }