mirror of
https://github.com/ocornut/imgui.git
synced 2024-11-28 01:20:55 +01:00
Merge pull request #77 from ybunyak/master
Fix namespaces for Value() and Color() functions.
This commit is contained in:
commit
be93b842c1
12
imgui.cpp
12
imgui.cpp
@ -5182,22 +5182,22 @@ void ImGui::TreePop()
|
||||
PopID();
|
||||
}
|
||||
|
||||
void Value(const char* prefix, bool b)
|
||||
void ImGui::Value(const char* prefix, bool b)
|
||||
{
|
||||
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);
|
||||
}
|
||||
|
||||
void Value(const char* prefix, unsigned int v)
|
||||
void ImGui::Value(const char* prefix, unsigned int 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)
|
||||
{
|
||||
@ -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::SameLine();
|
||||
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::SameLine();
|
||||
|
Loading…
Reference in New Issue
Block a user