diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-10 12:33:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 12:33:44 +0100 |
| commit | b6aedc160d63dca1717a6a1b4c99e80590c20490 (patch) | |
| tree | e443e6457d4e2f5de6a00a89212135321491e63f /modules | |
| parent | 0464db3da8b1cb43942329f5e0af436584b84222 (diff) | |
| parent | af6758e008ea3b1284145bda5466db28492a8139 (diff) | |
Merge pull request #56663 from bruvzg/fix_tab_inf_loop
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/text_server_adv/text_server_adv.cpp | 6 | ||||
| -rw-r--r-- | modules/text_server_fb/text_server_fb.cpp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index d82e21581c..130af1a171 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/modules/text_server_adv/text_server_adv.cpp @@ -3668,6 +3668,12 @@ float TextServerAdvanced::shaped_text_tab_align(RID p_shaped, const PackedFloat3 const_cast<TextServerAdvanced *>(this)->shaped_text_update_breaks(p_shaped); } + for (int i = 0; i < p_tab_stops.size(); i++) { + if (p_tab_stops[i] <= 0) { + return 0.f; + } + } + int tab_index = 0; float off = 0.f; diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp index 1f7c5427be..a4e268d7b3 100644 --- a/modules/text_server_fb/text_server_fb.cpp +++ b/modules/text_server_fb/text_server_fb.cpp @@ -2665,6 +2665,12 @@ float TextServerFallback::shaped_text_tab_align(RID p_shaped, const PackedFloat3 const_cast<TextServerFallback *>(this)->shaped_text_update_breaks(p_shaped); } + for (int i = 0; i < p_tab_stops.size(); i++) { + if (p_tab_stops[i] <= 0) { + return 0.f; + } + } + int tab_index = 0; float off = 0.f; |