Account without matches: -opacity instead of hide

Hiding doesn't work properly
This commit is contained in:
miruka 2020-03-07 09:45:52 -04:00
parent 566aaf3a51
commit f60b46f26b
2 changed files with 11 additions and 27 deletions

View File

@ -43,12 +43,9 @@ HTileDelegate {
}
}
onActivated: {
becomeSelected()
pageLoader.showPage(
"AccountSettings/AccountSettings", { "userId": model.id }
)
}
onActivated: pageLoader.showPage(
"AccountSettings/AccountSettings", { "userId": model.id }
)
readonly property alias addChat: addChat
@ -94,12 +91,9 @@ HTileDelegate {
icon.name: "add-chat"
backgroundColor: "transparent"
toolTip.text: qsTr("Add new chat")
onClicked: {
becomeSelected()
pageLoader.showPage(
"AddChat/AddChat", {userId: model.id},
)
}
onClicked: pageLoader.showPage(
"AddChat/AddChat", {userId: model.id},
)
leftPadding: theme.spacing / 2
rightPadding: leftPadding

View File

@ -13,10 +13,8 @@ Column {
property string userId: model.id
readonly property HListView view: ListView.view
readonly property int listIndex: index
readonly property bool hide:
mainPane.filter &&
roomList.model.count < 1 &&
! utils.filterMatches(mainPane.filter, model.display_name)
readonly property bool noFilterResults:
mainPane.filter && roomList.model.count === 0
readonly property alias account: account
readonly property alias collapsed: account.collapsed
@ -28,22 +26,14 @@ Column {
width: parent.width
view: accountRooms.view
opacity: hide ?
0 :
collapsed && ! mainPane.filter ?
theme.mainPane.account.collapsedOpacity :
1
scale: hide ? opacity : 1
height: implicitHeight * (hide ? opacity : 1)
Behavior on opacity { HNumberAnimation {} }
opacity: collapsed || noFilterResults ?
theme.mainPane.account.collapsedOpacity : 1
}
HListView {
id: roomList
width: parent.width
height: hide ? 0 : contentHeight
visible: ! hide
height: contentHeight
interactive: false
model: SortFilterProxyModel {