From 4a7e6d3f48ed2f39beae64a306ee6d8688b8c08b Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Mon, 13 Dec 2021 22:07:59 -0500
Subject: [PATCH] Fix a few things

---
 resources/qml/RoomList.qml            | 16 ++--------------
 resources/qml/delegates/Encrypted.qml |  4 ++--
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index d972f8cd..d40ff2b3 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -31,7 +31,7 @@ Page {
         anchors.right: parent.right
         height: parent.height
         model: Rooms
-        reuseItems: false
+        reuseItems: true
 
         ScrollHelper {
             flickable: parent
@@ -139,7 +139,7 @@ Page {
             height: avatarSize + 2 * Nheko.paddingMedium
             width: ListView.view.width
             state: "normal"
-            ToolTip.visible: hovered && collapsed && !collapsedBubbleHover.hovered && !notificationBubbleHover.hovered
+            ToolTip.visible: hovered && collapsed
             ToolTip.text: roomName
             onClicked: {
                 console.log("tapped " + roomId);
@@ -239,8 +239,6 @@ Page {
                         width: Math.min(Math.max(collapsedBubbleText.width + Nheko.paddingMedium, height), parent.width)
                         radius: height / 2
                         color: hasLoudNotification ? Nheko.theme.red : roomItem.bubbleBackground
-                        ToolTip.text: notificationCount
-                        ToolTip.visible: collapsedBubbleHover.hovered && (notificationCount > 9999)
 
                         Label {
                             id: collapsedBubbleText
@@ -255,10 +253,6 @@ Page {
                             text: notificationCount > 9999 ? "9999+" : notificationCount
                         }
 
-                        HoverHandler {
-                            id: collapsedBubbleHover
-                        }
-
                     }
 
                 }
@@ -345,12 +339,6 @@ Page {
                                 color: hasLoudNotification ? "white" : roomItem.bubbleText
                                 text: notificationCount > 9999 ? "9999+" : notificationCount
 
-                                onTextChanged: {
-                                    let old = parent.width
-                                    parent.width = Math.max(probableWidth + Nheko.paddingMedium, parent.height)
-                                    console.log(old + " changed to " + parent.width)
-                                }
-
                                 HoverHandler {
                                     id: notificationBubbleHover
                                 }
diff --git a/resources/qml/delegates/Encrypted.qml b/resources/qml/delegates/Encrypted.qml
index 0486737e..076b5a5e 100644
--- a/resources/qml/delegates/Encrypted.qml
+++ b/resources/qml/delegates/Encrypted.qml
@@ -14,7 +14,7 @@ Rectangle {
     required property int encryptionError
     required property string eventId
 
-    radius: fontMetrics.xHeight + Nheko.paddingMedium
+    radius: fontMetrics.lineSpacing / 2 + Nheko.paddingMedium
     width: parent ? parent.width : undefined
     height: contents.implicitHeight + Nheko.paddingMedium * 2
     color: Nheko.colors.alternateBase
@@ -56,7 +56,7 @@ Rectangle {
                         return qsTr("Unknown decryption error");
                     }
                 }
-                color: Nheko.colors.buttonText
+                color: Nheko.colors.text
                 width: parent ? parent.width : undefined
             }