noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #64670 from Mickeon/fix-label-visibile-percent

Browse Source 
Clamp Label's `percent_visible` properly between 0 and 1.0
This commit is contained in:
Yuri Sizov
2022-08-22 15:41:31 +03:00
committed by GitHub
parent d5052d9084 9a63792a08
commit 69c9d1f8e6
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/gui/label.cpp
+6 -2
View File
@@ -764,13 +764,17 @@ int Label::get_visible_characters() const {
void Label::set_percent_visible(float p_percent) {
if (percent_visible != p_percent) {
if (p_percent < 0 || p_percent >= 1) {
if (percent_visible >= 1.0) {
visible_chars = -1;
percent_visible = 1;
percent_visible = 1.0;
} else if (percent_visible < 0.0) {
visible_chars = 0;
percent_visible = 0.0;
} else {
visible_chars = get_total_character_count() * p_percent;
percent_visible = p_percent;
}
if (visible_chars_behavior == TextServer::VC_CHARS_BEFORE_SHAPING) {
dirty = true;
}
scene/gui/rich_text_label.cpp
+7 -3
View File
@@ -4912,15 +4912,19 @@ void RichTextLabel::set_percent_visible(float p_percent) {
if (percent_visible != p_percent) {
_stop_thread();
if (p_percent < 0 || p_percent >= 1) {
if (percent_visible >= 1.0) {
visible_characters = -1;
percent_visible = 1;
percent_visible = 1.0;
} else if (percent_visible < 0.0) {
visible_characters = 0;
percent_visible = 0.0;
} else {
visible_characters = get_total_character_count() * p_percent;
percent_visible = p_percent;
}
if (visible_chars_behavior == TextServer::VC_CHARS_BEFORE_SHAPING) {
main->first_invalid_line.store(0); //invalidate ALL
main->first_invalid_line.store(0); // Invalidate ALL.
_validate_line_caches();
}
update();