diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-02 14:40:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 14:40:26 +0200 |
| commit | f20c00a9351a6a6151bc0a0dafdb5fbfc4fcd42b (patch) | |
| tree | 93fe31303068f18e666b9af2eed88830aa07042d | |
| parent | 33fd41472c7fb54280144fe46326cd6ffe9fc8af (diff) | |
| parent | 4404c71ca161c44d41a3c4766308434caf12987a (diff) | |
Merge pull request #51170 from timothyqiu/spin-slider-osx
Use Command+Drag in EditSpinSlider on macOS
| -rw-r--r-- | editor/editor_spin_slider.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp index 58ab7d3cef..a802afda0f 100644 --- a/editor/editor_spin_slider.cpp +++ b/editor/editor_spin_slider.cpp @@ -32,12 +32,18 @@ #include "core/input/input.h" #include "core/math/expression.h" +#include "core/os/keyboard.h" #include "editor_node.h" #include "editor_scale.h" String EditorSpinSlider::get_tooltip(const Point2 &p_pos) const { if (grabber->is_visible()) { - return TS->format_number(rtos(get_value())) + "\n\n" + TTR("Hold Ctrl to round to integers. Hold Shift for more precise changes."); +#ifdef OSX_ENABLED + const int key = KEY_META; +#else + const int key = KEY_CTRL; +#endif + return TS->format_number(rtos(get_value())) + "\n\n" + vformat(TTR("Hold %s to round to integers. Hold Shift for more precise changes."), find_keycode_name(key)); } return TS->format_number(rtos(get_value())); } @@ -116,7 +122,7 @@ void EditorSpinSlider::_gui_input(const Ref<InputEvent> &p_event) { pre_grab_value = get_max(); } - if (mm->is_ctrl_pressed()) { + if (mm->is_command_pressed()) { // If control was just pressed, don't make the value do a huge jump in magnitude. if (grabbing_spinner_dist_cache != 0) { pre_grab_value += grabbing_spinner_dist_cache * get_step(); |