Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-28 01:20:55 +01:00
Code Releases Wiki Activity

Merge pull request #77 from ybunyak/master

Browse Source 
Fix namespaces for Value() and Color() functions.
This commit is contained in:
omar 2014-11-12 08:48:53 +09:00
commit be93b842c1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
imgui.cpp
View File

@ -5182,22 +5182,22 @@ void ImGui::TreePop()
PopID(); PopID();
} }
void Value(const char* prefix, bool b) void ImGui::Value(const char* prefix, bool b)
{ {
ImGui::Text("%s: %s", prefix, (b ? "true" : "false")); ImGui::Text("%s: %s", prefix, (b ? "true" : "false"));
} }
void Value(const char* prefix, int v) void ImGui::Value(const char* prefix, int v)
{ {
ImGui::Text("%s: %d", prefix, v); ImGui::Text("%s: %d", prefix, v);
} }
void Value(const char* prefix, unsigned int v) void ImGui::Value(const char* prefix, unsigned int v)
{ {
ImGui::Text("%s: %d", prefix, v); ImGui::Text("%s: %d", prefix, v);
} }
void Value(const char* prefix, float v, const char* float_format) void ImGui::Value(const char* prefix, float v, const char* float_format)
{ {
if (float_format) if (float_format)
{ {
@ -5211,14 +5211,14 @@ void Value(const char* prefix, float v, const char* float_format)
} }
} }
void Color(const char* prefix, const ImVec4& v) void ImGui::Color(const char* prefix, const ImVec4& v)
{ {
ImGui::Text("%s: (%.2f,%.2f,%.2f,%.2f)", prefix, v.x, v.y, v.z, v.w); ImGui::Text("%s: (%.2f,%.2f,%.2f,%.2f)", prefix, v.x, v.y, v.z, v.w);
ImGui::SameLine(); ImGui::SameLine();
ImGui::ColorButton(v, true); ImGui::ColorButton(v, true);
} }
void Color(const char* prefix, unsigned int v) void ImGui::Color(const char* prefix, unsigned int v)
{ {
ImGui::Text("%s: %08X", prefix, v); ImGui::Text("%s: %08X", prefix, v);
ImGui::SameLine(); ImGui::SameLine();