Spacing + untabify

This commit is contained in:
ocornut 2015-05-26 22:14:07 +01:00
parent 7b8b5754bc
commit 843219daec

View File

@ -6633,7 +6633,6 @@ bool ImGui::InputFloat(const char* label, float *v, float step, float step_fast,
value_changed = true; value_changed = true;
} }
} }
ImGui::PopID(); ImGui::PopID();
if (label_size.x > 0) if (label_size.x > 0)
@ -6642,7 +6641,6 @@ bool ImGui::InputFloat(const char* label, float *v, float step, float step_fast,
RenderText(ImVec2(window->DC.CursorPos.x, window->DC.CursorPos.y + style.FramePadding.y), label); RenderText(ImVec2(window->DC.CursorPos.x, window->DC.CursorPos.y + style.FramePadding.y), label);
ItemSize(label_size, style.FramePadding.y); ItemSize(label_size, style.FramePadding.y);
} }
ImGui::EndGroup(); ImGui::EndGroup();
return value_changed; return value_changed;
@ -10741,6 +10739,7 @@ void ImGui::ShowTestWindow(bool* opened)
ImGui::DragInt2("drag int2", vec4i, 1, 0, 255); ImGui::DragInt2("drag int2", vec4i, 1, 0, 255);
ImGui::InputInt2("input int2", vec4i); ImGui::InputInt2("input int2", vec4i);
ImGui::SliderInt2("slider int2", vec4i, 0, 255); ImGui::SliderInt2("slider int2", vec4i, 0, 255);
ImGui::Spacing();
ImGui::InputFloat3("input float3", vec4f); ImGui::InputFloat3("input float3", vec4f);
ImGui::DragFloat3("drag float3", vec4f, 0.01f, 0.0f, 1.0f); ImGui::DragFloat3("drag float3", vec4f, 0.01f, 0.0f, 1.0f);
@ -10748,6 +10747,7 @@ void ImGui::ShowTestWindow(bool* opened)
ImGui::DragInt3("drag int3", vec4i, 1, 0, 255); ImGui::DragInt3("drag int3", vec4i, 1, 0, 255);
ImGui::InputInt3("input int3", vec4i); ImGui::InputInt3("input int3", vec4i);
ImGui::SliderInt3("slider int3", vec4i, 0, 255); ImGui::SliderInt3("slider int3", vec4i, 0, 255);
ImGui::Spacing();
ImGui::InputFloat4("input float4", vec4f); ImGui::InputFloat4("input float4", vec4f);
ImGui::DragFloat4("drag float4", vec4f, 0.01f, 0.0f, 1.0f); ImGui::DragFloat4("drag float4", vec4f, 0.01f, 0.0f, 1.0f);