Przeglądaj źródła

Merge pull request #84232 from bruvzg/old_bug_waits_behind_the_wall

[TextServer] Fix glyph comparator ambiguous output.
Rémi Verschelde 1 rok temu
rodzic
commit
508b4b4b57
1 zmienionych plików z 1 dodań i 5 usunięć
  1. 1 5
      modules/text_server_adv/text_server_adv.h

+ 1 - 5
modules/text_server_adv/text_server_adv.h

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