Merge branch 'Kaidan/0.8'
commit
55a9776d2e
|
@ -632,10 +632,10 @@ void MessageModel::showMessageNotification(const Message &message, MessageOrigin
|
||||||
const auto accountJid = AccountManager::instance()->jid();
|
const auto accountJid = AccountManager::instance()->jid();
|
||||||
const auto chatJid = message.from();
|
const auto chatJid = message.from();
|
||||||
|
|
||||||
bool userMuted = !Kaidan::instance()->notificationsMuted(chatJid);
|
bool userMuted = Kaidan::instance()->notificationsMuted(chatJid);
|
||||||
bool chatActive =
|
bool chatActive =
|
||||||
isChatCurrentChat(accountJid, chatJid) &&
|
isChatCurrentChat(accountJid, chatJid) &&
|
||||||
QGuiApplication::applicationState() != Qt::ApplicationActive;
|
QGuiApplication::applicationState() == Qt::ApplicationActive;
|
||||||
|
|
||||||
if (!userMuted && !chatActive) {
|
if (!userMuted && !chatActive) {
|
||||||
const auto chatName = RosterModel::instance()->itemName(accountJid, chatJid);
|
const auto chatName = RosterModel::instance()->itemName(accountJid, chatJid);
|
||||||
|
|
|
@ -272,8 +272,16 @@ ChatPageBase {
|
||||||
height: messageListView.atYEnd ? 0 : 50
|
height: messageListView.atYEnd ? 0 : 50
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.bottomMargin: sendingPane.height + 5
|
anchors.bottomMargin: {
|
||||||
anchors.rightMargin: root.flickable.Controls.ScrollBar.vertical.implicitWidth + 5
|
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"
|
icon.name: "go-down"
|
||||||
onClicked: messageListView.positionViewAtIndex(0, ListView.Center)
|
onClicked: messageListView.positionViewAtIndex(0, ListView.Center)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue