ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix completion when tabing users

Browse Source 
This was caused by weird bindings. Now just access the userId value
directly.

Fix #324

(cherry picked from commit d9125148fe)
This commit is contained in:
Carl Schwan
2021-05-28 14:25:55 +02:00
parent 51b6593f96
commit 293288a0b6
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imports/NeoChat/Component/ChatBox/ChatBar.qml
View File

@@ -371,7 +371,7 @@ ToolBar {
function complete() { function complete() {
documentHandler.replaceAutoComplete(completionMenu.currentDisplayText); documentHandler.replaceAutoComplete(completionMenu.currentDisplayText);
if (completionMenu.completionType === ChatDocumentHandler.User) { if (completionMenu.completionType === ChatDocumentHandler.User) {
userAutocompleted[completionMenu.currentDisplayText] = completionMenu.currentUserId; userAutocompleted[completionMenu.currentDisplayText] = completionMenu.currentItem.userId;
} }
} }
} }

9
imports/NeoChat/Component/ChatBox/CompletionMenu.qml
View File

@@ -22,8 +22,7 @@ Popup {
property alias delegate: completionListView.delegate property alias delegate: completionListView.delegate
// Autocomplee text // Autocomplee text
property string currentDisplayText: currentItem && currentItem.displayName ? currentItem.displayName : "" property string currentDisplayText: currentItem && (currentItem.displayName ?? "")
property string currentUserId: currentItem && currentItem.id ? currentItem.id : ""
property int completionType: ChatDocumentHandler.Emoji property int completionType: ChatDocumentHandler.Emoji
property int beginPosition: 0 property int beginPosition: 0
@@ -78,6 +77,7 @@ Popup {
id: usernameItem id: usernameItem
width: ListView.view.width ?? implicitWidth width: ListView.view.width ?? implicitWidth
property string displayName: modelData.displayName property string displayName: modelData.displayName
property string userId: modelData.id
leading: Kirigami.Avatar { leading: Kirigami.Avatar {
implicitHeight: Kirigami.Units.gridUnit implicitHeight: Kirigami.Units.gridUnit
implicitWidth: implicitHeight implicitWidth: implicitHeight
@@ -86,11 +86,6 @@ Popup {
} }
text: modelData.displayName text: modelData.displayName
onClicked: completeTriggered(); onClicked: completeTriggered();
Component.onCompleted: {
completionMenu.currentUserId = Qt.binding(() => {
return modelData.id ?? "";
});
}
} }
} }