From 9220a75980f8502b57d4a8d9e19d77fea24e1ce8 Mon Sep 17 00:00:00 2001 From: miruka Date: Mon, 19 Aug 2019 11:42:24 -0400 Subject: [PATCH] DelegateAccount: don't force collapsed to false --- src/qml/SidePane/DelegateAccount.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qml/SidePane/DelegateAccount.qml b/src/qml/SidePane/DelegateAccount.qml index 85d4a3e9..8a24c64d 100644 --- a/src/qml/SidePane/DelegateAccount.qml +++ b/src/qml/SidePane/DelegateAccount.qml @@ -17,7 +17,6 @@ HInteractiveRectangle { Boolean(accountRoomList.filter) readonly property bool collapsed: - ! forceExpand && accountRoomList.collapseAccounts[model.data.user_id] || false @@ -45,7 +44,8 @@ HInteractiveRectangle { displayName: model.data.display_name avatarUrl: model.data.avatar_url - opacity: collapsed ? theme.sidePane.account.collapsedOpacity : 1 + opacity: collapsed && ! forceExpand ? + theme.sidePane.account.collapsedOpacity : 1 Behavior on opacity { HNumberAnimation {} } Layout.topMargin: model.index > 0 ? sidePane.currentSpacing / 2 : 0 @@ -62,7 +62,8 @@ HInteractiveRectangle { leftPadding: sidePane.currentSpacing verticalAlignment: Text.AlignVCenter - opacity: collapsed ? theme.sidePane.account.collapsedOpacity : 1 + opacity: collapsed && ! forceExpand ? + theme.sidePane.account.collapsedOpacity : 1 Behavior on opacity { HNumberAnimation {} } Layout.fillWidth: true