diff --git a/src/MessageModel.cpp b/src/MessageModel.cpp index 80585ed..a56c93a 100644 --- a/src/MessageModel.cpp +++ b/src/MessageModel.cpp @@ -632,10 +632,10 @@ void MessageModel::showMessageNotification(const Message &message, MessageOrigin const auto accountJid = AccountManager::instance()->jid(); const auto chatJid = message.from(); - bool userMuted = !Kaidan::instance()->notificationsMuted(chatJid); + bool userMuted = Kaidan::instance()->notificationsMuted(chatJid); bool chatActive = isChatCurrentChat(accountJid, chatJid) && - QGuiApplication::applicationState() != Qt::ApplicationActive; + QGuiApplication::applicationState() == Qt::ApplicationActive; if (!userMuted && !chatActive) { const auto chatName = RosterModel::instance()->itemName(accountJid, chatJid); diff --git a/src/qml/ChatPage.qml b/src/qml/ChatPage.qml index 61792a8..88053cf 100644 --- a/src/qml/ChatPage.qml +++ b/src/qml/ChatPage.qml @@ -272,8 +272,16 @@ ChatPageBase { height: messageListView.atYEnd ? 0 : 50 anchors.right: parent.right anchors.bottom: parent.bottom - anchors.bottomMargin: sendingPane.height + 5 - anchors.rightMargin: root.flickable.Controls.ScrollBar.vertical.implicitWidth + 5 + anchors.bottomMargin: { + Kirigami.Settings.isMobile + ? sendingPane.height + : sendingPane.height + 5 + } + anchors.rightMargin: { + Kirigami.Settings.isMobile + ? root.flickable.Controls.ScrollBar.vertical.implicitWidth + 35 + : root.flickable.Controls.ScrollBar.vertical.implicitWidth + 5 + } icon.name: "go-down" onClicked: messageListView.positionViewAtIndex(0, ListView.Center)