Use controls.

2020-02-12 02:20:29 -08:00
parent d3b926bc8e
commit cd10a8474a
5 changed files with 90 additions and 109 deletions
--- a/imports/Spectral/Component/Timeline/StateDelegate.qml
+++ b/imports/Spectral/Component/Timeline/StateDelegate.qml
@@ -8,73 +8,47 @@ import Spectral.Dialog 2.0
 import Spectral.Effect 2.0
 import Spectral.Setting 0.1

-Control {
-    id: root
+RowLayout {
+    id: row

-    padding: 8
+    Avatar {
+        Layout.preferredWidth: 24
+        Layout.preferredHeight: 24

-    contentItem: RowLayout {
-        id: row
+        hint: author.displayName
+        source: author.avatarMediaId
+        color: author.color

-        Control {
-            Layout.alignment: Qt.AlignTop
+        Component {
+            id: userDetailDialog

-            id: authorControl
-
-            padding: 4
-
-            background: Rectangle {
-                radius: height / 2
-                color: author.color
-            }
-
-            contentItem: RowLayout {
-                Avatar {
-                    Layout.preferredWidth: 24
-                    Layout.preferredHeight: 24
-
-                    hint: author.displayName
-                    source: author.avatarMediaId
-                    color: Qt.darker(author.color, 1.1)
-
-                    Component {
-                        id: userDetailDialog
-
-                        UserDetailDialog {}
-                    }
-
-                    RippleEffect {
-                        anchors.fill: parent
-
-                        circular: true
-
-                        onClicked: userDetailDialog.createObject(ApplicationWindow.overlay, {"room": currentRoom, "user": author.object, "displayName": author.displayName, "avatarMediaId": author.avatarMediaId, "avatarUrl": author.avatarUrl}).open()
-                    }
-                }
-
-                Label {
-                    Layout.alignment: Qt.AlignVCenter
-
-                    text: author.displayName
-                    font.pixelSize: 13
-                    font.weight: Font.Medium
-                    color: "white"
-                    rightPadding: 8
-                }
-            }
+            UserDetailDialog {}
        }

-        Label {
-            Layout.fillWidth: true
-            Layout.maximumWidth: messageListView.width - authorControl.width - row.spacing - (root.padding * 2)
+        RippleEffect {
+            anchors.fill: parent

-            text: display + " • " + Qt.formatTime(time)
-            color: MPalette.foreground
-            font.pixelSize: 13
-            font.weight: Font.Medium
+            circular: true

-            wrapMode: Label.Wrap
-            onLinkActivated: Qt.openUrlExternally(link)
+            onClicked: userDetailDialog.createObject(ApplicationWindow.overlay, {"room": currentRoom, "user": author.object, "displayName": author.displayName, "avatarMediaId": author.avatarMediaId, "avatarUrl": author.avatarUrl}).open()
        }
    }
+
+    Label {
+        Layout.alignment: Qt.AlignVCenter
+
+        text: author.displayName
+        font.pixelSize: 13
+        font.bold: true
+    }
+
+    Label {
+        text: model.display
+        color: MPalette.foreground
+        font.pixelSize: 13
+        font.weight: Font.Medium
+
+        wrapMode: Label.Wrap
+        onLinkActivated: Qt.openUrlExternally(link)
+    }
 }