summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-05-30 22:13:49 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-05-30 22:13:49 +0200
commit517b674c91eba5445189e212d80f2f7289a23114 (patch)
treee56e10834ba87d119ceb10e1e679157ac6b6743e
parent34fe09dda768746305ab611a32c87862d440a248 (diff)
parentaf6b96c486ad9f92ee0344a49be781cae83cebe1 (diff)
downloadredot-engine-517b674c91eba5445189e212d80f2f7289a23114.tar.gz
Merge pull request #92557 from kitbdev/dont-scroll-too-high
Fix minimap error when moving to the top
-rw-r--r--scene/gui/text_edit.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 1dd00fab4d..fba3d46cd0 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -4393,13 +4393,7 @@ int TextEdit::get_minimap_line_at_pos(const Point2i &p_pos) const {
}
}
- if (row < 0) {
- row = 0;
- }
-
- if (row >= text.size()) {
- row = text.size() - 1;
- }
+ row = CLAMP(row, 0, text.size() - 1);
return row;
}
@@ -7991,7 +7985,7 @@ void TextEdit::_update_minimap_click() {
}
Point2i next_line = get_next_visible_line_index_offset_from(row, 0, -get_visible_line_count() / 2);
- int first_line = row - next_line.x + 1;
+ int first_line = MAX(0, row - next_line.x + 1);
double delta = get_scroll_pos_for_line(first_line, next_line.y) - get_v_scroll();
if (delta < 0) {
_scroll_up(-delta, true);