godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 19:31:35 +00:00
Code Releases Wiki Activity

Keep RichTextLabel visible character properties in sync

Browse Source 
The RichTextLabel class is inconsistent in how it updates the
visible_characters and percent_visible properties when either is changed.

To keep both properties consistent, update percent_visible when setting the
visible_characters property.
For both properties, when setting one, notify change for the other.

Docs updated for member set_visible_characters on RichTextLabel class.
This commit is contained in:
Alexander Pech
2021-01-02 21:46:44 +11:00
parent 7a16efc885
commit 463e2002ab
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/classes/RichTextLabel.xml
View File

@@ -455,6 +455,7 @@
</member> </member>
<member name="visible_characters" type="int" setter="set_visible_characters" getter="get_visible_characters" default="-1"> <member name="visible_characters" type="int" setter="set_visible_characters" getter="get_visible_characters" default="-1">
The restricted number of characters to display in the label. If [code]-1[/code], all characters will be displayed. The restricted number of characters to display in the label. If [code]-1[/code], all characters will be displayed.
[b]Note:[/b] Setting this property updates [member percent_visible] based on current [method get_total_character_count].
</member> </member>
</members> </members>
<signals> <signals>

10
scene/gui/rich_text_label.cpp
View File

@@ -3716,6 +3716,7 @@ void RichTextLabel::set_percent_visible(float p_percent) {
} }
main->first_invalid_line = 0; //invalidate ALL main->first_invalid_line = 0; //invalidate ALL
_validate_line_caches(main); _validate_line_caches(main);
_change_notify("visible_characters");
update(); update();
} }
} }
@@ -3929,6 +3930,15 @@ void RichTextLabel::_bind_methods() {
void RichTextLabel::set_visible_characters(int p_visible) { void RichTextLabel::set_visible_characters(int p_visible) {
visible_characters = p_visible; visible_characters = p_visible;
if (p_visible == -1) {
percent_visible = 1;
} else {
int total_char_count = get_total_character_count();
if (total_char_count > 0) {
percent_visible = (float)p_visible / (float)total_char_count;
}
}
_change_notify("percent_visible");
update(); update();
} }