From d33538316c81b548e9b6724afc3486c17ad925f2 Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Tue, 20 Jul 2021 19:57:36 -0400 Subject: [PATCH] Fix the loading spinner setup This fixes binding loops and gives it a (in my opinion) sane size. --- resources/qml/RoomMembers.qml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/resources/qml/RoomMembers.qml b/resources/qml/RoomMembers.qml index 6f847ccc..3758cb0b 100644 --- a/resources/qml/RoomMembers.qml +++ b/resources/qml/RoomMembers.qml @@ -118,11 +118,21 @@ ApplicationWindow { } - footer: Spinner { - visible: members.numUsersLoaded < members.memberCount && members.loadingMoreMembers + footer: Item { + width: parent.width + visible: (members.numUsersLoaded < members.memberCount) && members.loadingMoreMembers + // use the default height if it's visible, otherwise no height at all - height: visible ? undefined : 0 - anchors.centerIn: parent + height: membersLoadingSpinner.height + anchors.margins: Nheko.paddingMedium + + Spinner { + id: membersLoadingSpinner + + anchors.centerIn: parent + height: visible ? 35 : 0 + } + } }