summary refs log tree commit diff
path: root/resources
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2022-04-27 01:15:25 +0000
committerGitHub <noreply@github.com>2022-04-27 01:15:25 +0000
commit5ceed8f519a1123d9ae5cb59b681a5b2f838cbfc (patch)
tree0256e3ea76f849c97aa450381418b891fbfc92ab /resources
parentFix scaling of animated images in fullscreen image viewer (diff)
parentModifications to member list buttons (diff)
downloadnheko-5ceed8f519a1123d9ae5cb59b681a5b2f838cbfc.tar.xz
Merge pull request #1056 from Nheko-Reborn/uiTweaks
UI tweaks
Diffstat (limited to 'resources')
-rw-r--r--resources/qml/TimelineView.qml12
-rw-r--r--resources/qml/dialogs/HiddenEventsDialog.qml2
-rw-r--r--resources/qml/dialogs/RoomSettings.qml23
3 files changed, 25 insertions, 12 deletions
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml

index a7bfe1ef..a9d48fb9 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 { @@ -199,8 +208,7 @@ Item { Layout.alignment: Qt.AlignHCenter MatrixText { - text: qsTr("%1 member(s)").arg(room ? room.roomMemberCount : 0) - cursorShape: Qt.PointingHandCursor + text: qsTr("%n member(s)", "", room ? room.roomMemberCount : 0) } ImageButton { 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 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