Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-24 15:50:25 +01:00
Code Releases Wiki Activity

Data types: Fix format srtings with leading blanks. Fix ColorEdit4() to not use obsolete formats (when using IMGUI_DISABLE_OBSOLETE_FUNCTIONS) (#643)

Browse Source
This commit is contained in:
omar 2018-05-08 23:35:26 +02:00
parent 5f464877ed
commit 4cabf599c4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
imgui.cpp
View File

@ -8750,10 +8750,13 @@ static inline TYPE RoundScalarWithFormat(const char* format, ImGuiDataType data_
return v; return v;
char v_str[64]; char v_str[64];
ImFormatString(v_str, IM_ARRAYSIZE(v_str), fmt_start, v); ImFormatString(v_str, IM_ARRAYSIZE(v_str), fmt_start, v);
const char* p = v_str;
while (*p == ' ')
p++;
if (data_type == ImGuiDataType_Float || data_type == ImGuiDataType_Double) if (data_type == ImGuiDataType_Float || data_type == ImGuiDataType_Double)
v = (TYPE)atof(v_str); v = (TYPE)atof(p);
else else
ImAtoi(v_str, (SIGNEDTYPE*)&v); ImAtoi(p, (SIGNEDTYPE*)&v);
return v; return v;
} }
@ -11910,9 +11913,9 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag
const char* ids[4] = { "##X", "##Y", "##Z", "##W" }; const char* ids[4] = { "##X", "##Y", "##Z", "##W" };
const char* fmt_table_int[3][4] = const char* fmt_table_int[3][4] =
{ {
{ "%3.0f", "%3.0f", "%3.0f", "%3.0f" }, // Short display { "%3d", "%3d", "%3d", "%3d" }, // Short display
{ "R:%3.0f", "G:%3.0f", "B:%3.0f", "A:%3.0f" }, // Long display for RGBA { "R:%3d", "G:%3d", "B:%3d", "A:%3d" }, // Long display for RGBA
{ "H:%3.0f", "S:%3.0f", "V:%3.0f", "A:%3.0f" } // Long display for HSVA { "H:%3d", "S:%3d", "V:%3d", "A:%3d" } // Long display for HSVA
}; };
const char* fmt_table_float[3][4] = const char* fmt_table_float[3][4] =
{ {