Refactor MessageArea composer alias handling

Simplify the code, make it more declarative, and improve the reliability
of sending typing notifications (notably when changing the used alias in
the middle of a message).
This commit is contained in:
miruka
2020-08-24 05:44:25 -04:00
parent aba47ef26b
commit 83f35c034e
4 changed files with 68 additions and 84 deletions

View File

@@ -2,6 +2,7 @@
import QtQuick 2.12
import QtQuick.Layouts 1.12
import "../../.."
import "../../../Base"
import "../AutoCompletion"
@@ -24,19 +25,15 @@ Rectangle {
HUserAvatar {
id: avatar
readonly property QtObject writerInfo:
ModelStore.get("accounts").find(clientUserId)
clientUserId: messageArea.writerId
userId: clientUserId
mxc: writerInfo ? writerInfo.avatar_url : ""
displayName: writerInfo ? writerInfo.display_name : ""
radius: 0
clientUserId: messageArea.writingUserId
userId: messageArea.writingUserId
mxc:
messageArea.writingUserInfo ?
messageArea.writingUserInfo.avatar_url :
""
displayName:
messageArea.writingUserInfo ?
messageArea.writingUserInfo.display_name :
""
}
HScrollView {