aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiquel Lionel <lionel@les-miquelots.net>2022-02-15 21:11:15 +0100
committerMiquel Lionel <lionel@les-miquelots.net>2022-02-15 21:11:49 +0100
commit3af6b9251b3442b6918388474a5778f37ba6fb63 (patch)
tree27b449738496e8e12c243cdb5bb681b837f470b3
parentff25148afd75ad8ba6c454b1e39ad4d3022f0e18 (diff)
downloadkdeltachat-3af6b9251b3442b6918388474a5778f37ba6fb63.tar.gz
kdeltachat-3af6b9251b3442b6918388474a5778f37ba6fb63.zip
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
-rw-r--r--qml/ChatPage.qml2
-rw-r--r--qml/Message.qml1
2 files changed, 2 insertions, 1 deletions
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