From 82edb4fc2962a462b53e17f6ec209291f83d8887 Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Fri, 17 May 2019 15:18:46 -0400
Subject: [PATCH] Fix HListView delegate height bug

Remove the populate transition animation, responsible for the glitch
where items overlap each others
---
 harmonyqml/components/Base/HListView.qml                 | 4 ----
 harmonyqml/components/Chat/Chat.qml                      | 6 ------
 harmonyqml/components/Chat/RoomSidePane/RoomSidePane.qml | 7 +------
 harmonyqml/components/UI.qml                             | 3 +--
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/harmonyqml/components/Base/HListView.qml b/harmonyqml/components/Base/HListView.qml
index dadc84ba..28170bd3 100644
--- a/harmonyqml/components/Base/HListView.qml
+++ b/harmonyqml/components/Base/HListView.qml
@@ -7,10 +7,6 @@ ListView {
         NumberAnimation { properties: "x,y"; from: 100; duration: duration }
     }
 
-    populate: Transition {
-        NumberAnimation { properties: "x,y"; duration: duration }
-    }
-
     move: Transition {
         NumberAnimation { properties: "x,y"; duration: duration }
     }
diff --git a/harmonyqml/components/Chat/Chat.qml b/harmonyqml/components/Chat/Chat.qml
index f5cfec97..aa0482c9 100644
--- a/harmonyqml/components/Chat/Chat.qml
+++ b/harmonyqml/components/Chat/Chat.qml
@@ -85,8 +85,6 @@ HColumnLayout {
             onActiveViewChanged:
                 activeView ? restoreAnimation.start() : hideAnimation.start()
 
-            property bool wasHiddenOnce: false
-
             NumberAnimation {
                 id: hideAnimation
                 target: roomSidePane
@@ -96,7 +94,6 @@ HColumnLayout {
                 to: 0
 
                 onStarted: {
-                    target.wasHiddenOnce = true
                     target.oldWidth = target.width
                     target.Layout.minimumWidth = 0
                 }
@@ -110,9 +107,6 @@ HColumnLayout {
                 from: 0
                 to: target.oldWidth
 
-                // Prevent RoomEventDelegate positions glitch on startup
-                onStarted: if (! target.wasHiddenOnce) { complete() }
-
                 onStopped: target.Layout.minimumWidth = Qt.binding(
                     function() { return HStyle.avatar.size }
                 )
diff --git a/harmonyqml/components/Chat/RoomSidePane/RoomSidePane.qml b/harmonyqml/components/Chat/RoomSidePane/RoomSidePane.qml
index 9dab2d0f..1fbfbc77 100644
--- a/harmonyqml/components/Chat/RoomSidePane/RoomSidePane.qml
+++ b/harmonyqml/components/Chat/RoomSidePane/RoomSidePane.qml
@@ -8,12 +8,7 @@ HRectangle {
     property bool collapsed: false
     property var activeView: null
 
-    HColumnLayout {
+    MembersView {
         anchors.fill: parent
-
-        MembersView {
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-        }
     }
 }
diff --git a/harmonyqml/components/UI.qml b/harmonyqml/components/UI.qml
index adb54d22..23d54eff 100644
--- a/harmonyqml/components/UI.qml
+++ b/harmonyqml/components/UI.qml
@@ -84,8 +84,7 @@ Item {
                 onTriggered: pageStack.showRoom(
                     "@test_mary:matrix.org",
                     "Rooms",
-                    //"!TSXGsbBbdwsdylIOJZ:matrix.org"
-                    "!HfNYlUkGqcWcpDQJpb:matrix.org"
+                    "!TSXGsbBbdwsdylIOJZ:matrix.org"
                 )
             }