From 3d60fadb3998f73790d88438f3e741a97813f3bc Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Tue, 19 Apr 2022 23:42:47 -0400
Subject: [PATCH 1/4] Allow users to see through the spinner

---
 resources/qml/TimelineView.qml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 3f439439..e72e79ce 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -46,6 +46,15 @@ Item {
         // height is somewhat arbitrary here... don't set width because width scales w/ height
         height: parent.height / 16
         z: 3
+        opacity: hh.hovered ? 0.3 : 1
+
+        Behavior on opacity {
+            NumberAnimation { duration: 100; }
+        }
+
+        HoverHandler {
+            id: hh
+        }
     }
 
     ColumnLayout {

From 24ec2181a38a0af29765f68d6c7e531fa70212ec Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Tue, 19 Apr 2022 23:43:00 -0400
Subject: [PATCH 2/4] Better handle pluralization

---
 resources/qml/TimelineView.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index e72e79ce..00fac563 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -208,7 +208,7 @@ Item {
             Layout.alignment: Qt.AlignHCenter
 
             MatrixText {
-                text: qsTr("%1 member(s)").arg(room ? room.roomMemberCount : 0)
+                text: qsTr("%n member(s)", "", room ? room.roomMemberCount : 0)
                 cursorShape: Qt.PointingHandCursor
             }
 

From c53b732452aced5f89005b5d0b1d3d008d001bac Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Thu, 21 Apr 2022 23:19:14 -0400
Subject: [PATCH 3/4] Set default size for hidden events dialog

---
 resources/qml/dialogs/HiddenEventsDialog.qml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/qml/dialogs/HiddenEventsDialog.qml b/resources/qml/dialogs/HiddenEventsDialog.qml
index e0e79604..444ce6a1 100644
--- a/resources/qml/dialogs/HiddenEventsDialog.qml
+++ b/resources/qml/dialogs/HiddenEventsDialog.qml
@@ -17,6 +17,8 @@ ApplicationWindow {
 
     modality: Qt.NonModal
     flags: Qt.Dialog | Qt.WindowTitleHint
+    width: 275
+    height: 220
     minimumWidth: 250
     minimumHeight: 220
 

From f9b3690e87b5cf4ae8c940b6f75800b6ab884832 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Sat, 23 Apr 2022 18:53:22 -0400
Subject: [PATCH 4/4] Modifications to member list buttons

---
 resources/qml/TimelineView.qml         |  1 -
 resources/qml/dialogs/RoomSettings.qml | 25 ++++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 00fac563..458a4824 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -209,7 +209,6 @@ Item {
 
             MatrixText {
                 text: qsTr("%n member(s)", "", room ? room.roomMemberCount : 0)
-                cursorShape: Qt.PointingHandCursor
             }
 
             ImageButton {
diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml
index 110475c7..4a7b24fe 100644
--- a/resources/qml/dialogs/RoomSettings.qml
+++ b/resources/qml/dialogs/RoomSettings.qml
@@ -159,22 +159,25 @@ ApplicationWindow {
 
             }
 
+            RowLayout {
+                spacing: Nheko.paddingMedium
+                Layout.alignment: Qt.AlignHCenter
+
                 Label {
                     text: qsTr("%n member(s)", "", roomSettings.memberCount)
-                    Layout.alignment: Qt.AlignHCenter
                     color: Nheko.colors.text
-
-                    TapHandler {
-                        onSingleTapped: TimelineManager.openRoomMembers(Rooms.getRoomById(roomSettings.roomId))
-                    }
-
-                    CursorShape {
-                        cursorShape: Qt.PointingHandCursor
-                        anchors.fill: parent
-                    }
-
                 }
 
+                ImageButton {
+                    image: ":/icons/icons/ui/people.svg"
+                    hoverEnabled: true
+                    ToolTip.visible: hovered
+                    ToolTip.text: qsTr("View members of %1").arg(roomSettings.roomName)
+                    onClicked: TimelineManager.openRoomMembers(Rooms.getRoomById(roomSettings.roomId))
+                }
+
+            }
+
             TextArea {
                 id: roomTopic
                 property bool cut: implicitHeight > 100