From 7283b2dd4d003991f2ca514188acd6b971c0e6c9 Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Wed, 17 May 2023 22:39:05 +0200
Subject: [PATCH] Use NavigationTabButtons for Emoji and sticker categories

---
 src/qml/Component/Emoji/EmojiPicker.qml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/qml/Component/Emoji/EmojiPicker.qml b/src/qml/Component/Emoji/EmojiPicker.qml
index 11d164652..91933b229 100644
--- a/src/qml/Component/Emoji/EmojiPicker.qml
+++ b/src/qml/Component/Emoji/EmojiPicker.qml
@@ -165,12 +165,14 @@ ColumnLayout {
 
     Component {
         id: emojiDelegate
-        EmojiDelegate {
+        Kirigami.NavigationTabButton {
             width: root.categoryIconSize
             height: width
             checked: categories.currentIndex === model.index
-            emoji: modelData ? modelData.emoji : ""
-            name: modelData ? modelData.name : ""
+            text: modelData ? modelData.emoji : ""
+            QQC2.ToolTip.text: modelData ? modelData.name : ""
+            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+            QQC2.ToolTip.visible: hovered
             onClicked: {
                 categories.currentIndex = index;
                 categories.focus = true;
@@ -180,14 +182,17 @@ ColumnLayout {
 
     Component {
         id: stickerDelegate
-        EmojiDelegate {
+        Kirigami.NavigationTabButton {
             width: root.categoryIconSize
             height: width
-            emoji: model.avatarUrl ?? ""
-            isImage: true
-            name: model.displayName ?? ""
-            onClicked: stickerModel.packIndex = model.index
             checked: stickerModel.packIndex === model.index
+            contentItem: Image {
+                source: model.avatarUrl
+            }
+            QQC2.ToolTip.text: model.name
+            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+            QQC2.ToolTip.visible: hovered && !!model.name
+            onClicked: stickerModel.packIndex = model.index
         }
     }
 }