From 56b05a5a3d8a1c9124f36ab800141a3658930419 Mon Sep 17 00:00:00 2001 From: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> Date: Fri, 15 Mar 2024 14:40:50 +0100 Subject: [PATCH] [Editor] Remove redundant code from `EditorSpinSlider` --- editor/gui/editor_spin_slider.cpp | 40 +++++++++++++------------------ 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/editor/gui/editor_spin_slider.cpp b/editor/gui/editor_spin_slider.cpp index fab5784f167e..c0a704105c00 100644 --- a/editor/gui/editor_spin_slider.cpp +++ b/editor/gui/editor_spin_slider.cpp @@ -238,28 +238,28 @@ void EditorSpinSlider::_grabber_gui_input(const Ref &p_event) { void EditorSpinSlider::_value_input_gui_input(const Ref &p_event) { Ref k = p_event; if (k.is_valid() && k->is_pressed() && !is_read_only()) { - double step = get_step(); - if (step < 1) { - double divisor = 1.0 / get_step(); - - if (trunc(divisor) == divisor) { - step = 1.0; - } - } - - if (k->is_command_or_control_pressed()) { - step *= 100.0; - } else if (k->is_shift_pressed()) { - step *= 10.0; - } else if (k->is_alt_pressed()) { - step *= 0.1; - } - Key code = k->get_keycode(); switch (code) { case Key::UP: case Key::DOWN: { + double step = get_step(); + if (step < 1) { + double divisor = 1.0 / step; + + if (trunc(divisor) == divisor) { + step = 1.0; + } + } + + if (k->is_command_or_control_pressed()) { + step *= 100.0; + } else if (k->is_shift_pressed()) { + step *= 10.0; + } else if (k->is_alt_pressed()) { + step *= 0.1; + } + _evaluate_input_text(); double last_value = get_value(); @@ -267,12 +267,6 @@ void EditorSpinSlider::_value_input_gui_input(const Ref &p_event) { step *= -1; } set_value(last_value + step); - double new_value = get_value(); - - double clamp_value = CLAMP(new_value, get_min(), get_max()); - if (new_value != clamp_value) { - set_value(clamp_value); - } value_input_dirty = true; set_process_internal(true);