Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix LineEdit icon positon in right-to-left layout

Browse source
This commit is contained in:
Giganzo 2025-08-05 19:29:22 +02:00
parent 65eb664352
commit fbf27dbfc6
1 changed files with 72 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

98
scene/gui/line_edit.cpp
View file

@ -1128,8 +1128,7 @@ bool LineEdit::_is_over_clear_button(const Point2 &p_pos) const {
return false; return false;
} }
Ref<Texture2D> icon = theme_cache.clear_icon; Ref<Texture2D> icon = theme_cache.clear_icon;
int x_ofs = theme_cache.normal->get_margin(SIDE_RIGHT); return is_layout_rtl() ? p_pos.x < theme_cache.normal->get_margin(SIDE_LEFT) + icon->get_width() : p_pos.x > get_size().width - icon->get_width() - theme_cache.normal->get_margin(SIDE_RIGHT);
return p_pos.x > get_size().width - icon->get_width() - x_ofs;
} }
void LineEdit::_update_theme_item_cache() { void LineEdit::_update_theme_item_cache() {
@ -1226,12 +1225,12 @@ void LineEdit::_notification(int p_what) {
if (rtl) { if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - Math::ceil(style->get_margin(SIDE_RIGHT) + (text_width)))); x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - Math::ceil(style->get_margin(SIDE_RIGHT) + (text_width))));
} else { } else {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} }
} break; } break;
case HORIZONTAL_ALIGNMENT_CENTER: { case HORIZONTAL_ALIGNMENT_CENTER: {
if (!Math::is_zero_approx(scroll_offset)) { if (!Math::is_zero_approx(scroll_offset)) {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} else { } else {
int total_margin = style->get_margin(SIDE_LEFT) + style->get_margin(SIDE_RIGHT); int total_margin = style->get_margin(SIDE_LEFT) + style->get_margin(SIDE_RIGHT);
int centered = int((size.width - total_margin - text_width)) / 2; int centered = int((size.width - total_margin - text_width)) / 2;
@ -1240,7 +1239,7 @@ void LineEdit::_notification(int p_what) {
} break; } break;
case HORIZONTAL_ALIGNMENT_RIGHT: { case HORIZONTAL_ALIGNMENT_RIGHT: {
if (rtl) { if (rtl) {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} else { } else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - Math::ceil(style->get_margin(SIDE_RIGHT) + (text_width)))); x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - Math::ceil(style->get_margin(SIDE_RIGHT) + (text_width))));
} }
@ -1255,8 +1254,15 @@ void LineEdit::_notification(int p_what) {
int center = int(size.width - total_margin - text_width - r_icon->get_width()) / 2; int center = int(size.width - total_margin - text_width - r_icon->get_width()) / 2;
x_ofs = style->get_margin(SIDE_LEFT) + MAX(0, center); x_ofs = style->get_margin(SIDE_LEFT) + MAX(0, center);
} }
if (rtl) {
x_ofs += r_icon->get_width();
}
} else { } else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT)); if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT) + r_icon->get_width(), x_ofs);
} else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT));
}
} }
} }
@ -1352,12 +1358,12 @@ void LineEdit::_notification(int p_what) {
if (rtl) { if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - Math::ceil(style->get_margin(SIDE_RIGHT) + (text_width)))); x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - Math::ceil(style->get_margin(SIDE_RIGHT) + (text_width))));
} else { } else {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} }
} break; } break;
case HORIZONTAL_ALIGNMENT_CENTER: { case HORIZONTAL_ALIGNMENT_CENTER: {
if (!Math::is_zero_approx(scroll_offset)) { if (!Math::is_zero_approx(scroll_offset)) {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} else { } else {
int total_margin = style->get_margin(SIDE_LEFT) + style->get_margin(SIDE_RIGHT); int total_margin = style->get_margin(SIDE_LEFT) + style->get_margin(SIDE_RIGHT);
int centered = int((size.width - total_margin - text_width)) / 2; int centered = int((size.width - total_margin - text_width)) / 2;
@ -1366,7 +1372,7 @@ void LineEdit::_notification(int p_what) {
} break; } break;
case HORIZONTAL_ALIGNMENT_RIGHT: { case HORIZONTAL_ALIGNMENT_RIGHT: {
if (rtl) { if (rtl) {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} else { } else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - Math::ceil(style->get_margin(SIDE_RIGHT) + (text_width)))); x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - Math::ceil(style->get_margin(SIDE_RIGHT) + (text_width))));
} }
@ -1405,7 +1411,11 @@ void LineEdit::_notification(int p_what) {
} }
} }
r_icon->draw(ci, Point2(width - r_icon->get_width() - style->get_margin(SIDE_RIGHT), height / 2 - r_icon->get_height() / 2), color_icon); Point2 icon_pos = Point2(width - r_icon->get_width() - style->get_margin(SIDE_RIGHT), height / 2 - r_icon->get_height() / 2);
if (rtl) {
icon_pos.x = style->get_margin(SIDE_LEFT);
}
r_icon->draw(ci, icon_pos, color_icon);
if (alignment == HORIZONTAL_ALIGNMENT_CENTER) { if (alignment == HORIZONTAL_ALIGNMENT_CENTER) {
if (Math::is_zero_approx(scroll_offset)) { if (Math::is_zero_approx(scroll_offset)) {
@ -1413,11 +1423,20 @@ void LineEdit::_notification(int p_what) {
int center = int(size.width - total_margin - text_width - r_icon->get_width()) / 2; int center = int(size.width - total_margin - text_width - r_icon->get_width()) / 2;
x_ofs = style->get_margin(SIDE_LEFT) + MAX(0, center); x_ofs = style->get_margin(SIDE_LEFT) + MAX(0, center);
} }
if (rtl) {
x_ofs += r_icon->get_width();
}
} else { } else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT)); if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT) + r_icon->get_width(), x_ofs);
} else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT));
}
} }
ofs_max -= r_icon->get_width(); if (!rtl) {
ofs_max -= r_icon->get_width();
}
} }
// Draw selections rects. // Draw selections rects.
@ -1515,7 +1534,7 @@ void LineEdit::_notification(int p_what) {
} break; } break;
case HORIZONTAL_ALIGNMENT_RIGHT: { case HORIZONTAL_ALIGNMENT_RIGHT: {
if (rtl) { if (rtl) {
caret.l_caret = Rect2(Vector2(style->get_offset().x, y), Size2(caret_width, h)); caret.l_caret = Rect2(Vector2(x_ofs, y), Size2(caret_width, h));
} else { } else {
caret.l_caret = Rect2(Vector2(ofs_max, y), Size2(caret_width, h)); caret.l_caret = Rect2(Vector2(ofs_max, y), Size2(caret_width, h));
} }
@ -1788,12 +1807,12 @@ void LineEdit::set_caret_at_pixel_pos(int p_x) {
if (rtl) { if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width))); x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width)));
} else { } else {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} }
} break; } break;
case HORIZONTAL_ALIGNMENT_CENTER: { case HORIZONTAL_ALIGNMENT_CENTER: {
if (!Math::is_zero_approx(scroll_offset)) { if (!Math::is_zero_approx(scroll_offset)) {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} else { } else {
int total_margin = style->get_margin(SIDE_LEFT) + style->get_margin(SIDE_RIGHT); int total_margin = style->get_margin(SIDE_LEFT) + style->get_margin(SIDE_RIGHT);
int centered = int((get_size().width - total_margin - text_width)) / 2; int centered = int((get_size().width - total_margin - text_width)) / 2;
@ -1802,7 +1821,7 @@ void LineEdit::set_caret_at_pixel_pos(int p_x) {
} break; } break;
case HORIZONTAL_ALIGNMENT_RIGHT: { case HORIZONTAL_ALIGNMENT_RIGHT: {
if (rtl) { if (rtl) {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} else { } else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width))); x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width)));
} }
@ -1819,8 +1838,15 @@ void LineEdit::set_caret_at_pixel_pos(int p_x) {
int center = int(get_size().width - total_margin - text_width - r_icon->get_width()) / 2; int center = int(get_size().width - total_margin - text_width - r_icon->get_width()) / 2;
x_ofs = style->get_margin(SIDE_LEFT) + MAX(0, center); x_ofs = style->get_margin(SIDE_LEFT) + MAX(0, center);
} }
if (rtl) {
x_ofs += r_icon->get_width();
}
} else { } else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT)); if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT) + r_icon->get_width(), x_ofs);
} else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT));
}
} }
} }
@ -1843,12 +1869,12 @@ Vector2 LineEdit::get_caret_pixel_pos() {
if (rtl) { if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width))); x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width)));
} else { } else {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} }
} break; } break;
case HORIZONTAL_ALIGNMENT_CENTER: { case HORIZONTAL_ALIGNMENT_CENTER: {
if (!Math::is_zero_approx(scroll_offset)) { if (!Math::is_zero_approx(scroll_offset)) {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} else { } else {
int total_margin = style->get_margin(SIDE_LEFT) + style->get_margin(SIDE_RIGHT); int total_margin = style->get_margin(SIDE_LEFT) + style->get_margin(SIDE_RIGHT);
int centered = int((get_size().width - total_margin - text_width)) / 2; int centered = int((get_size().width - total_margin - text_width)) / 2;
@ -1857,7 +1883,7 @@ Vector2 LineEdit::get_caret_pixel_pos() {
} break; } break;
case HORIZONTAL_ALIGNMENT_RIGHT: { case HORIZONTAL_ALIGNMENT_RIGHT: {
if (rtl) { if (rtl) {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} else { } else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width))); x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width)));
} }
@ -1874,8 +1900,15 @@ Vector2 LineEdit::get_caret_pixel_pos() {
int center = int(get_size().width - total_margin - text_width - r_icon->get_width()) / 2; int center = int(get_size().width - total_margin - text_width - r_icon->get_width()) / 2;
x_ofs = style->get_margin(SIDE_LEFT) + MAX(0, center); x_ofs = style->get_margin(SIDE_LEFT) + MAX(0, center);
} }
if (rtl) {
x_ofs += r_icon->get_width();
}
} else { } else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT)); if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT) + r_icon->get_width(), x_ofs);
} else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT));
}
} }
} }
@ -2198,12 +2231,12 @@ void LineEdit::set_caret_column(int p_column) {
if (rtl) { if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width))); x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width)));
} else { } else {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} }
} break; } break;
case HORIZONTAL_ALIGNMENT_CENTER: { case HORIZONTAL_ALIGNMENT_CENTER: {
if (!Math::is_zero_approx(scroll_offset)) { if (!Math::is_zero_approx(scroll_offset)) {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} else { } else {
int total_margin = style->get_margin(SIDE_LEFT) + style->get_margin(SIDE_RIGHT); int total_margin = style->get_margin(SIDE_LEFT) + style->get_margin(SIDE_RIGHT);
int centered = int((get_size().width - total_margin - text_width)) / 2; int centered = int((get_size().width - total_margin - text_width)) / 2;
@ -2212,7 +2245,7 @@ void LineEdit::set_caret_column(int p_column) {
} break; } break;
case HORIZONTAL_ALIGNMENT_RIGHT: { case HORIZONTAL_ALIGNMENT_RIGHT: {
if (rtl) { if (rtl) {
x_ofs = style->get_offset().x; x_ofs = style->get_margin(SIDE_LEFT);
} else { } else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width))); x_ofs = MAX(style->get_margin(SIDE_LEFT), int(get_size().width - style->get_margin(SIDE_RIGHT) - (text_width)));
} }
@ -2230,10 +2263,23 @@ void LineEdit::set_caret_column(int p_column) {
int center = int(get_size().width - total_margin - text_width - r_icon->get_width()) / 2; int center = int(get_size().width - total_margin - text_width - r_icon->get_width()) / 2;
x_ofs = style->get_margin(SIDE_LEFT) + MAX(0, center); x_ofs = style->get_margin(SIDE_LEFT) + MAX(0, center);
} }
if (rtl) {
x_ofs += r_icon->get_width();
}
} else { } else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT)); if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT) + r_icon->get_width(), x_ofs);
} else {
if (rtl) {
x_ofs = MAX(style->get_margin(SIDE_LEFT) + r_icon->get_width(), x_ofs);
} else {
x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT));
}
}
}
if (!rtl) {
ofs_max -= r_icon->get_width();
} }
ofs_max -= r_icon->get_width();
} }
// Note: Use two coordinates to fit IME input range. // Note: Use two coordinates to fit IME input range.