godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #91384 from kitbdev/fix-spin-slider-margin 

Fix editor spin slider RTL and margin
This commit is contained in:
Rémi Verschelde 2024-05-02 17:31:36 +02:00
parent a7029e4c8a 5fd23730eb
commit a531452eec
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
editor/gui/editor_spin_slider.cpp
View File

@ -59,17 +59,16 @@ void EditorSpinSlider::gui_input(const Ref<InputEvent> &p_event) {
if (mb.is_valid()) { if (mb.is_valid()) {
if (mb->get_button_index() == MouseButton::LEFT) { if (mb->get_button_index() == MouseButton::LEFT) {
if (mb->is_pressed()) { if (mb->is_pressed()) {
if (updown_offset != -1 && mb->get_position().x > updown_offset) { if (updown_offset != -1 && ((!is_layout_rtl() && mb->get_position().x > updown_offset) || (is_layout_rtl() && mb->get_position().x < updown_offset))) {
//there is an updown, so use it. // Updown pressed.
if (mb->get_position().y < get_size().height / 2) { if (mb->get_position().y < get_size().height / 2) {
set_value(get_value() + get_step()); set_value(get_value() + get_step());
} else { } else {
set_value(get_value() - get_step()); set_value(get_value() - get_step());
} }
return; return;
} else {
_grab_start();
} }
_grab_start();
} else { } else {
_grab_end(); _grab_end();
} }
@ -121,7 +120,7 @@ void EditorSpinSlider::gui_input(const Ref<InputEvent> &p_event) {
} }
} }
} else if (updown_offset != -1) { } else if (updown_offset != -1) {
bool new_hover = (mm->get_position().x > updown_offset); bool new_hover = (!is_layout_rtl() && mm->get_position().x > updown_offset) || (is_layout_rtl() && mm->get_position().x < updown_offset);
if (new_hover != hover_updown) { if (new_hover != hover_updown) {
hover_updown = new_hover; hover_updown = new_hover;
queue_redraw(); queue_redraw();
@ -296,11 +295,9 @@ void EditorSpinSlider::_update_value_input_stylebox() {
// higher margin to match the location where the text begins. // higher margin to match the location where the text begins.
// The margin values below were determined by empirical testing. // The margin values below were determined by empirical testing.
if (is_layout_rtl()) { if (is_layout_rtl()) {
stylebox->set_content_margin(SIDE_LEFT, 0);
stylebox->set_content_margin(SIDE_RIGHT, (!get_label().is_empty() ? 23 : 16) * EDSCALE); stylebox->set_content_margin(SIDE_RIGHT, (!get_label().is_empty() ? 23 : 16) * EDSCALE);
} else { } else {
stylebox->set_content_margin(SIDE_LEFT, (!get_label().is_empty() ? 23 : 16) * EDSCALE); stylebox->set_content_margin(SIDE_LEFT, (!get_label().is_empty() ? 23 : 16) * EDSCALE);
stylebox->set_content_margin(SIDE_RIGHT, 0);
} }
value_input->add_theme_style_override("normal", stylebox); value_input->add_theme_style_override("normal", stylebox);
@ -394,6 +391,9 @@ void EditorSpinSlider::_draw_spin_slider() {
c *= Color(1.2, 1.2, 1.2); c *= Color(1.2, 1.2, 1.2);
} }
draw_texture(updown2, Vector2(updown_offset, updown_vofs), c); draw_texture(updown2, Vector2(updown_offset, updown_vofs), c);
if (rtl) {
updown_offset += updown2->get_width();
}
if (grabber->is_visible()) { if (grabber->is_visible()) {
grabber->hide(); grabber->hide();
} }
@ -705,6 +705,7 @@ void EditorSpinSlider::_ensure_input_popup() {
} }
value_input_popup = memnew(Control); value_input_popup = memnew(Control);
value_input_popup->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
add_child(value_input_popup); add_child(value_input_popup);
value_input = memnew(LineEdit); value_input = memnew(LineEdit);