diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-29 11:20:14 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-29 11:20:14 +0200 |
| commit | 219af366a5922169c49c60a3a0beaa892275c013 (patch) | |
| tree | fbcf2de8fc9288cf71557225bbdeabd0f09cdd15 | |
| parent | 05442e81c0fac409269662d090273159c0b5a210 (diff) | |
| parent | 1d0a8ea82843164041319044584413903cebf16a (diff) | |
| download | redot-engine-219af366a5922169c49c60a3a0beaa892275c013.tar.gz | |
Merge pull request #92505 from bruvzg/te_ro_margins
[TextEdit] Use style margins for selection in read-only mode.
| -rw-r--r-- | scene/gui/text_edit.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index a36eb0652e..1dd00fab4d 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -4237,8 +4237,11 @@ String TextEdit::get_word_at_pos(const Vector2 &p_pos) const { } Point2i TextEdit::get_line_column_at_pos(const Point2i &p_pos, bool p_allow_out_of_bounds) const { - float rows = p_pos.y; - rows -= theme_cache.style_normal->get_margin(SIDE_TOP); + float rows = p_pos.y - theme_cache.style_normal->get_margin(SIDE_TOP); + if (!editable) { + rows -= theme_cache.style_readonly->get_offset().y / 2; + rows += theme_cache.style_normal->get_offset().y / 2; + } rows /= get_line_height(); rows += _get_v_scroll_offset(); int first_vis_line = get_first_visible_line(); @@ -4269,6 +4272,10 @@ Point2i TextEdit::get_line_column_at_pos(const Point2i &p_pos, bool p_allow_out_ int col = 0; int colx = p_pos.x - (theme_cache.style_normal->get_margin(SIDE_LEFT) + gutters_width + gutter_padding); colx += first_visible_col; + if (!editable) { + colx -= theme_cache.style_readonly->get_offset().x / 2; + colx += theme_cache.style_normal->get_offset().x / 2; + } col = _get_char_pos_for_line(colx, row, wrap_index); if (get_line_wrapping_mode() != LineWrappingMode::LINE_WRAPPING_NONE && wrap_index < get_line_wrap_count(row)) { // Move back one if we are at the end of the row. |