diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-28 09:03:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-28 09:03:15 +0100 |
| commit | a6751e6c58e73d6b8d04e98bba5fb6e380fdf34f (patch) | |
| tree | bf22de8b8d89dee6a3b59c22adacff8f62a8d5eb /scene/gui/check_box.cpp | |
| parent | bd846001327dacd35a84b0759f8b7ca8b892e841 (diff) | |
| parent | 7e2c0ffd1a19d5806a7fcf57e25d2465f7a8f8b6 (diff) | |
Merge pull request #41100 from bruvzg/ctl_text_server_interface
[Complex Text Layouts] Implement TextServer interface.
Diffstat (limited to 'scene/gui/check_box.cpp')
| -rw-r--r-- | scene/gui/check_box.cpp | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp index df6f38f65d..0c78369688 100644 --- a/scene/gui/check_box.cpp +++ b/scene/gui/check_box.cpp @@ -68,8 +68,14 @@ Size2 CheckBox::get_minimum_size() const { } void CheckBox::_notification(int p_what) { - if (p_what == NOTIFICATION_THEME_CHANGED) { - _set_internal_margin(MARGIN_LEFT, get_icon_size().width); + if ((p_what == NOTIFICATION_THEME_CHANGED) || (p_what == NOTIFICATION_LAYOUT_DIRECTION_CHANGED || (p_what == NOTIFICATION_TRANSLATION_CHANGED))) { + if (is_layout_rtl()) { + _set_internal_margin(MARGIN_LEFT, 0.f); + _set_internal_margin(MARGIN_RIGHT, get_icon_size().width); + } else { + _set_internal_margin(MARGIN_LEFT, get_icon_size().width); + _set_internal_margin(MARGIN_RIGHT, 0.f); + } } else if (p_what == NOTIFICATION_DRAW) { RID ci = get_canvas_item(); @@ -78,7 +84,11 @@ void CheckBox::_notification(int p_what) { Ref<StyleBox> sb = get_theme_stylebox("normal"); Vector2 ofs; - ofs.x = sb->get_margin(MARGIN_LEFT); + if (is_layout_rtl()) { + ofs.x = get_size().x - sb->get_margin(MARGIN_RIGHT) - get_icon_size().width; + } else { + ofs.x = sb->get_margin(MARGIN_LEFT); + } ofs.y = int((get_size().height - get_icon_size().height) / 2) + get_theme_constant("check_vadjust"); if (is_pressed()) { @@ -96,8 +106,14 @@ bool CheckBox::is_radio() { CheckBox::CheckBox(const String &p_text) : Button(p_text) { set_toggle_mode(true); + set_text_align(ALIGN_LEFT); - _set_internal_margin(MARGIN_LEFT, get_icon_size().width); + + if (is_layout_rtl()) { + _set_internal_margin(MARGIN_RIGHT, get_icon_size().width); + } else { + _set_internal_margin(MARGIN_LEFT, get_icon_size().width); + } } CheckBox::~CheckBox() { |