Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added actual logarithmic sliders #1316

Closed
wants to merge 1 commit into from
Closed

Added actual logarithmic sliders #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions imgui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6550,7 +6550,13 @@ static inline float SliderBehaviorCalcRatioFromValue(float v, float v_min, float

const bool is_non_linear = (power < 1.0f-0.00001f) || (power > 1.0f+0.00001f);
const float v_clamped = (v_min < v_max) ? ImClamp(v, v_min, v_max) : ImClamp(v, v_max, v_min);
if (is_non_linear)

if (power == 0.0f)
{
// Logarithmic
return logf(v_clamped / v_min) / logf(v_max / v_min);
}
else if (is_non_linear)
{
if (v_clamped < 0.0f)
{
Expand Down Expand Up @@ -6628,7 +6634,12 @@ bool ImGui::SliderBehavior(const ImRect& frame_bb, ImGuiID id, float* v, float v
if (set_new_value)
{
float new_value;
if (is_non_linear)
if (power == 0.0f)
{
// Logarithmic
new_value = v_min * powf(v_max / v_min, clicked_t);
}
else if (is_non_linear)
{
// Account for logarithmic scale on both sides of the zero
if (clicked_t < linear_zero_pos)
Expand Down
4 changes: 2 additions & 2 deletions imgui_demo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,9 @@ void ImGui::ShowTestWindow(bool* p_open)
ImGui::SliderInt("slider int", &i1, -1, 3);
ImGui::SameLine(); ShowHelpMarker("CTRL+click to input value.");

static float f1=0.123f, f2=0.0f;
static float f1=0.123f, f2=1.0f;
ImGui::SliderFloat("slider float", &f1, 0.0f, 1.0f, "ratio = %.3f");
ImGui::SliderFloat("slider log float", &f2, -10.0f, 10.0f, "%.4f", 3.0f);
ImGui::SliderFloat("slider log float", &f2, 0.01f, 100.0f, "%.4f", 0.0f);
static float angle = 0.0f;
ImGui::SliderAngle("slider angle", &angle);
}
Expand Down