Remove ImageItem, Paintable and use unified image provider.

2018-12-03 19:55:42 +08:00
parent 641c82beb7
commit 8959be2cb8
29 changed files with 125 additions and 324 deletions
--- a/imports/Spectral/Panel/RoomPanelInput.qml
+++ b/imports/Spectral/Panel/RoomPanelInput.qml
@@ -50,11 +50,11 @@ Control {

            spacing: 8

-            ImageItem {
+            Avatar {
                Layout.preferredWidth: 32
                Layout.preferredHeight: 32

-                source: replyUser ? replyUser.paintable : null
+                source: replyUser ? replyUser.avatarUrl : ""
                hint: replyUser ? replyUser.displayName : "No name"
            }

@@ -125,11 +125,11 @@ Control {
                        verticalAlignment: Text.AlignVCenter
                        horizontalAlignment: Text.AlignHCenter
                    }
-                    ImageItem {
+                    Avatar {
                        width: 20
                        height: 20
                        visible: !isEmoji
-                        source: modelData.paintable || null
+                        source: modelData.avatarUrl || null
                    }
                    Label {
                        height: parent.height