asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #84232 from bruvzg/old_bug_waits_behind_the_wall

Browse source 
[TextServer] Fix glyph comparator ambiguous output.
This commit is contained in:
Rémi Verschelde 2023-10-31 13:47:49 +01:00
commit 508b4b4b57
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/text_server_adv/text_server_adv.h
View file

@ -681,11 +681,7 @@ class TextServerAdvanced : public TextServerExtension {
_FORCE_INLINE_ bool operator()(const Glyph &l, const Glyph &r) const { _FORCE_INLINE_ bool operator()(const Glyph &l, const Glyph &r) const {
if (l.start == r.start) { if (l.start == r.start) {
if (l.count == r.count) { if (l.count == r.count) {
if ((l.flags & TextServer::GRAPHEME_IS_VIRTUAL) == TextServer::GRAPHEME_IS_VIRTUAL) { return (l.flags & TextServer::GRAPHEME_IS_VIRTUAL) < (r.flags & TextServer::GRAPHEME_IS_VIRTUAL);
return false;
} else {
return true;
}
} }
return l.count > r.count; // Sort first glyph with count & flags, order of the rest are irrelevant. return l.count > r.count; // Sort first glyph with count & flags, order of the rest are irrelevant.
} else { } else {