From 9077ea39251eb3c38c69eca7016ab81e40c61453 Mon Sep 17 00:00:00 2001 From: miruka Date: Fri, 23 Aug 2019 10:53:54 -0400 Subject: [PATCH] Fix timer setting current AccountsRoomList index --- src/qml/Base/HTileDelegate.qml | 4 +++- src/qml/SidePane/AccountRoomList.qml | 1 + src/qml/SidePane/DelegateAccount.qml | 2 ++ src/qml/SidePane/DelegateRoom.qml | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qml/Base/HTileDelegate.qml b/src/qml/Base/HTileDelegate.qml index b7642069..85243b54 100644 --- a/src/qml/Base/HTileDelegate.qml +++ b/src/qml/Base/HTileDelegate.qml @@ -17,6 +17,7 @@ HButton { readonly property alias additionalInfo: additionalInfo readonly property alias rightInfo: rightInfo readonly property alias subtitle: subtitle + readonly property alias setCurrentTimer: setCurrentTimer property HMenu contextMenu: HMenu {} @@ -77,9 +78,10 @@ HButton { Timer { + id: setCurrentTimer interval: 100 repeat: true - // running: true + running: true // Component.onCompleted won't work for this onTriggered: if (shouldBeCurrent) view.currentIndex = model.index } diff --git a/src/qml/SidePane/AccountRoomList.qml b/src/qml/SidePane/AccountRoomList.qml index 4f4d9457..1ce1e920 100644 --- a/src/qml/SidePane/AccountRoomList.qml +++ b/src/qml/SidePane/AccountRoomList.qml @@ -10,6 +10,7 @@ HListView { readonly property var originSource: window.sidePaneModelSource readonly property var collapseAccounts: window.uiState.collapseAccounts readonly property string filter: paneToolBar.roomFilter + readonly property alias activateLimiter: activateLimiter onOriginSourceChanged: filterLimiter.restart() onFilterChanged: filterLimiter.restart() diff --git a/src/qml/SidePane/DelegateAccount.qml b/src/qml/SidePane/DelegateAccount.qml index 6d065ad6..0a76b3f5 100644 --- a/src/qml/SidePane/DelegateAccount.qml +++ b/src/qml/SidePane/DelegateAccount.qml @@ -15,6 +15,8 @@ HTileDelegate { window.uiState.page == "Pages/EditAccount/EditAccount.qml" && window.uiState.pageProperties.userId == model.data.user_id + setCurrentTimer.running: ! accountRoomList.activateLimiter.running + Behavior on opacity { HNumberAnimation {} } diff --git a/src/qml/SidePane/DelegateRoom.qml b/src/qml/SidePane/DelegateRoom.qml index fa9f98eb..eb2ec277 100644 --- a/src/qml/SidePane/DelegateRoom.qml +++ b/src/qml/SidePane/DelegateRoom.qml @@ -14,6 +14,8 @@ HTileDelegate { window.uiState.pageProperties.userId == model.user_id && window.uiState.pageProperties.roomId == model.data.room_id + setCurrentTimer.running: ! accountRoomList.activateLimiter.running + Behavior on opacity { HNumberAnimation {} }