|
|
|
@ -1790,7 +1790,7 @@ static const ImGuiDataTypeInfo GDataTypeInfo[] = |
|
|
|
|
{ sizeof(ImS64), "S64", "%lld", "%lld" }, // ImGuiDataType_S64
|
|
|
|
|
{ sizeof(ImU64), "U64", "%llu", "%llu" }, |
|
|
|
|
#endif |
|
|
|
|
{ sizeof(float), "float", "%f", "%f" }, // ImGuiDataType_Float (float are promoted to double in va_arg)
|
|
|
|
|
{ sizeof(float), "float", "%.3f","%f" }, // ImGuiDataType_Float (float are promoted to double in va_arg)
|
|
|
|
|
{ sizeof(double), "double","%f", "%lf" }, // ImGuiDataType_Double
|
|
|
|
|
}; |
|
|
|
|
IM_STATIC_ASSERT(IM_ARRAYSIZE(GDataTypeInfo) == ImGuiDataType_COUNT); |
|
|
|
@ -2302,6 +2302,7 @@ bool ImGui::DragScalar(const char* label, ImGuiDataType data_type, void* p_data, |
|
|
|
|
const ImGuiStyle& style = g.Style; |
|
|
|
|
const ImGuiID id = window->GetID(label); |
|
|
|
|
const float w = CalcItemWidth(); |
|
|
|
|
|
|
|
|
|
const ImVec2 label_size = CalcTextSize(label, NULL, true); |
|
|
|
|
const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y * 2.0f)); |
|
|
|
|
const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0.0f)); |
|
|
|
|