asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #51171 from timothyqiu/spin-slider-osx-3x

Browse source 
[3.x] Use Command+Drag in EditSpinSlider on macOS
This commit is contained in:
Rémi Verschelde 2021-08-02 14:36:35 +02:00 committed by GitHub
commit 76e202c07b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editor/editor_spin_slider.cpp
View file

@ -31,12 +31,18 @@
#include "editor_spin_slider.h" #include "editor_spin_slider.h"
#include "core/math/expression.h" #include "core/math/expression.h"
#include "core/os/input.h" #include "core/os/input.h"
#include "core/os/keyboard.h"
#include "editor_node.h" #include "editor_node.h"
#include "editor_scale.h" #include "editor_scale.h"
String EditorSpinSlider::get_tooltip(const Point2 &p_pos) const { String EditorSpinSlider::get_tooltip(const Point2 &p_pos) const {
if (grabber->is_visible()) { if (grabber->is_visible()) {
return 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_CONTROL;
#endif
return rtos(get_value()) + "\n\n" + vformat(TTR("Hold %s to round to integers. Hold Shift for more precise changes."), find_keycode_name(key));
} }
return rtos(get_value()); return rtos(get_value());
} }
@ -113,7 +119,7 @@ void EditorSpinSlider::_gui_input(const Ref<InputEvent> &p_event) {
pre_grab_value = get_max(); pre_grab_value = get_max();
} }
if (mm->get_control()) { if (mm->get_command()) {
// If control was just pressed, don't make the value do a huge jump in magnitude. // If control was just pressed, don't make the value do a huge jump in magnitude.
if (grabbing_spinner_dist_cache != 0) { if (grabbing_spinner_dist_cache != 0) {
pre_grab_value += grabbing_spinner_dist_cache * get_step(); pre_grab_value += grabbing_spinner_dist_cache * get_step();