KaidanIM
/
Kaidan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Kaidan/0.8'

master
Linus Jahn 2021-05-27 22:54:44 +02:00
parent de4d3153c4 5374c441e5
commit 55a9776d2e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MessageModel.cpp
View File

@ -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);

12
src/qml/ChatPage.qml
View File

@ -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)