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

GetColorU32(ImGuiCol): avoid using GImGui twice since some implementation make it a TLS-ish variable with non-trivial accessors.

Browse Source
This commit is contained in:
omar 2017-07-26 14:35:50 +08:00
parent 95fe11b5bf
commit 9d0e5beaa7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imgui.cpp
View File

@ -1241,15 +1241,17 @@ ImU32 ImGui::ColorConvertFloat4ToU32(const ImVec4& in)
ImU32 ImGui::GetColorU32(ImGuiCol idx, float alpha_mul) ImU32 ImGui::GetColorU32(ImGuiCol idx, float alpha_mul)
{ {
ImVec4 c = GImGui->Style.Colors[idx]; ImGuiStyle& style = GImGui->Style;
c.w *= GImGui->Style.Alpha * alpha_mul; ImVec4 c = style.Colors[idx];
c.w *= style.Alpha * alpha_mul;
return ColorConvertFloat4ToU32(c); return ColorConvertFloat4ToU32(c);
} }
ImU32 ImGui::GetColorU32(const ImVec4& col) ImU32 ImGui::GetColorU32(const ImVec4& col)
{ {
ImGuiStyle& style = GImGui->Style;
ImVec4 c = col; ImVec4 c = col;
c.w *= GImGui->Style.Alpha; c.w *= style.Alpha;
return ColorConvertFloat4ToU32(c); return ColorConvertFloat4ToU32(c);
} }