godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect caret position when clicking a 'LineEdit' with a non-left alignment

Browse Source
This commit is contained in:
Michael Alexsander Silva Dias 2019-07-15 19:32:41 -03:00
parent efd55631e2
commit d91346f720
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/line_edit.cpp
View File

@ -999,6 +999,8 @@ void LineEdit::set_cursor_at_pixel_pos(int p_x) {
Ref<StyleBox> style = get_stylebox("normal"); Ref<StyleBox> style = get_stylebox("normal");
int pixel_ofs = 0; int pixel_ofs = 0;
Size2 size = get_size(); Size2 size = get_size();
bool display_clear_icon = !text.empty() && is_editable() && clear_button_enabled;
int r_icon_width = Control::get_icon("clear")->get_width();
switch (align) { switch (align) {
@ -1013,10 +1015,16 @@ void LineEdit::set_cursor_at_pixel_pos(int p_x) {
pixel_ofs = int(style->get_offset().x); pixel_ofs = int(style->get_offset().x);
else else
pixel_ofs = int(size.width - (cached_width)) / 2; pixel_ofs = int(size.width - (cached_width)) / 2;
if (display_clear_icon)
pixel_ofs -= int(r_icon_width / 2 + style->get_margin(MARGIN_RIGHT));
} break; } break;
case ALIGN_RIGHT: { case ALIGN_RIGHT: {
pixel_ofs = int(size.width - style->get_margin(MARGIN_RIGHT) - (cached_width)); pixel_ofs = int(size.width - style->get_margin(MARGIN_RIGHT) - (cached_width));
if (display_clear_icon)
pixel_ofs -= int(r_icon_width + style->get_margin(MARGIN_RIGHT));
} break; } break;
} }