Fix missing icons after sorting in iconselect

psi-im · May 16, 2024 · 9dd9eda · 9dd9eda
1 parent 7cc9014
commit 9dd9eda
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/widgets/emojiregistry.cpp b/src/widgets/emojiregistry.cpp
@@ -32,7 +32,7 @@ const EmojiRegistry &EmojiRegistry::instance()
 bool EmojiRegistry::isEmoji(const QString &code) const
 {
     auto cat = startCategory(code);
-    return cat == Category::Emoji || cat == Category::SkinTone;
+    return cat == Category::Emoji || cat == Category::SkinTone || cat == Category::HairStyle;
     // TODO check the whole code is emoji. not just start
 }
 
@@ -120,7 +120,7 @@ std::pair<QStringView, int> EmojiRegistry::findEmoji(const QString &in, int idx)
             } else
                 break; // TODO review other categories when implemented
         } else if (!gotEmoji
-                   && (category == Category::Emoji || category == Category::SkinTone
+                   && (category == Category::Emoji || category == Category::SkinTone || category == Category::HairStyle
                        || category == Category::SimpleKeycap)) {
             if (emojiStart == -1)
                 emojiStart = idx;

diff --git a/src/widgets/iconselect.cpp b/src/widgets/iconselect.cpp
@@ -529,15 +529,18 @@ QList<PsiIcon *> IconSelect::sortEmojis() const
     for (auto const &group : EmojiRegistry::instance().groups) {
         for (auto const &subgroup : group.subGroups) {
             for (auto const &emoji : subgroup.emojis) {
-                auto icon = cp2icon.value(emoji.code);
+                auto icon = cp2icon.take(emoji.code);
                 if (icon) {
                     ret.append(icon);
                 }
             }
         }
     }
 
+    auto unused = cp2icon.values();
+    auto unique = QSet<PsiIcon *>(unused.begin(), unused.end());
     ret += notEmoji;
+    std::copy(unique.begin(), unique.end(), std::back_inserter(ret));
     return ret;
 }