Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shortcuts in instanciators breaking on reload

Browse Source 
When reloading the config file, the HShortcut within Instanciators (e.g.
Rooms.AtIndex) were deleted then recreated.
Except Shortcut happens to be an indestructible object type.
Thus the old HShortcuts left alive were conflicting with the ones
recreated, causing them to be called ambiguously.
Loaders are destructible, so we wrap the shortcuts inside one to fix the
issue.
This commit is contained in:
miruka 2021-04-15 16:49:40 -04:00
parent 3279a1befd
commit 61996400d0
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/MainPane/RoomList.qml
View File

@ -266,19 +266,23 @@ HListView {
Instantiator { Instantiator {
model: Object.keys(window.settings.Keys.Accounts.AtIndex) model: Object.keys(window.settings.Keys.Accounts.AtIndex)
delegate: HShortcut { delegate: Loader {
sourceComponent: HShortcut {
sequences: window.settings.Keys.Accounts.AtIndex[modelData] sequences: window.settings.Keys.Accounts.AtIndex[modelData]
onActivated: goToAccountNumber(parseInt(modelData, 10) - 1) onActivated: goToAccountNumber(parseInt(modelData, 10) - 1)
} }
} }
}
Instantiator { Instantiator {
model: Object.keys(window.settings.Keys.Rooms.AtIndex) model: Object.keys(window.settings.Keys.Rooms.AtIndex)
delegate: HShortcut { delegate: Loader {
sourceComponent: HShortcut {
sequences: window.settings.Keys.Rooms.AtIndex[modelData] sequences: window.settings.Keys.Rooms.AtIndex[modelData]
onActivated: showAccountRoomAtIndex(parseInt(modelData, 10) - 1) onActivated: showAccountRoomAtIndex(parseInt(modelData, 10) - 1)
} }
} }
}
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent