From 3af6b9251b3442b6918388474a5778f37ba6fb63 Mon Sep 17 00:00:00 2001 From: Miquel Lionel Date: Tue, 15 Feb 2022 21:11:15 +0100 Subject: Fix notification triggering for previously clicked convos - Also fix spacing on the right for message send by ourselves. tldr, we add a right margin in Message.qml --- qml/ChatPage.qml | 2 +- qml/Message.qml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'qml') diff --git a/qml/ChatPage.qml b/qml/ChatPage.qml index a82e0f6..87979ca 100644 --- a/qml/ChatPage.qml +++ b/qml/ChatPage.qml @@ -56,7 +56,7 @@ Kirigami.ScrollablePage { function onIncomingMessage(accountId, chatId, msgId) { updateMessagelist(); console.log("Incoming message for chat " + chatId); - if(!chat.muted || chatId != 0 || chatId != root.chatId) + if(!chat.muted && chatId != 0 && chatId != root.chatId) KNotif.send("onIncomingMessage",chat.getProfileImage() ,chat.name ,"has sent you a message.") } diff --git a/qml/Message.qml b/qml/Message.qml index d255430..e965aad 100644 --- a/qml/Message.qml +++ b/qml/Message.qml @@ -86,6 +86,7 @@ RowLayout { Rectangle { id: msgRect Layout.leftMargin: Kirigami.Units.largeSpacing + Layout.rightMargin: 2*Kirigami.Units.largeSpacing Layout.preferredWidth: messageContents.width Layout.preferredHeight: messageContents.height color: Kirigami.Theme.backgroundColor -- cgit v1.2.3-70-g09d2