mirror of
https://github.com/godotengine/godot.git
synced 2025-12-08 06:09:55 +00:00
Merge pull request #112295 from bruvzg/rtl_empty_scroll
[RTL] Do not apply scroll offset to empty RTL.
This commit is contained in:
commit
a259ad354f
1 changed files with 6 additions and 5 deletions
|
|
@ -2484,10 +2484,6 @@ void RichTextLabel::_notification(int p_what) {
|
||||||
queue_redraw();
|
queue_redraw();
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case NOTIFICATION_READY: {
|
|
||||||
_prepare_scroll_anchor();
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case NOTIFICATION_THEME_CHANGED: {
|
case NOTIFICATION_THEME_CHANGED: {
|
||||||
_stop_thread();
|
_stop_thread();
|
||||||
main->first_invalid_font_line.store(0); // Invalidate all lines.
|
main->first_invalid_font_line.store(0); // Invalidate all lines.
|
||||||
|
|
@ -2660,7 +2656,12 @@ void RichTextLabel::_notification(int p_what) {
|
||||||
}
|
}
|
||||||
if (scroll_follow_visible_characters && scroll_active) {
|
if (scroll_follow_visible_characters && scroll_active) {
|
||||||
scroll_visible = follow_vc_pos > 0;
|
scroll_visible = follow_vc_pos > 0;
|
||||||
vscroll->set_visible(follow_vc_pos > 0);
|
if (scroll_visible) {
|
||||||
|
_prepare_scroll_anchor();
|
||||||
|
} else {
|
||||||
|
scroll_w = 0;
|
||||||
|
}
|
||||||
|
vscroll->set_visible(scroll_visible);
|
||||||
}
|
}
|
||||||
if (has_focus() && get_tree()->is_accessibility_enabled()) {
|
if (has_focus() && get_tree()->is_accessibility_enabled()) {
|
||||||
RID ae;
|
RID ae;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue