godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81361 from bruvzg/ntdir 

[TextServer] Use locale or first span language to select preferred direction for neutral text.
This commit is contained in:
Rémi Verschelde 2023-09-07 13:52:57 +02:00
parent 698df41dac 1cb63fc719
commit 632bbc66b6
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/text_server_adv/text_server_adv.cpp
View File

@ -5880,8 +5880,11 @@ bool TextServerAdvanced::_shaped_text_shape(const RID &p_shaped) {
sd->para_direction = (direction == UBIDI_RTL) ? DIRECTION_RTL : DIRECTION_LTR;
sd->base_para_direction = direction;
} else {
sd->para_direction = DIRECTION_LTR;
sd->base_para_direction = UBIDI_DEFAULT_LTR;
const String &lang = (sd->spans.is_empty() || sd->spans[0].language.is_empty()) ? TranslationServer::get_singleton()->get_tool_locale() : sd->spans[0].language;
bool lang_rtl = _is_locale_right_to_left(lang);
sd->para_direction = lang_rtl ? DIRECTION_RTL : DIRECTION_LTR;
sd->base_para_direction = lang_rtl ? UBIDI_DEFAULT_RTL : UBIDI_DEFAULT_LTR;
}
} break;
}