From dd1f5793213d53e8abd5ab55c6bb1858a4a734cd Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Tue, 22 Sep 2020 11:53:10 -0400
Subject: [PATCH] misc: use Segoe UI Emoji font in the last interaction text
for windows
Change-Id: I0a6124ebe6a07fd6c89cfcd267b67ab78817ec5c
---
.../components/ConversationSmartListViewItemDelegate.qml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/mainview/components/ConversationSmartListViewItemDelegate.qml b/src/mainview/components/ConversationSmartListViewItemDelegate.qml
index 2b31840fe..d54f7cffd 100644
--- a/src/mainview/components/ConversationSmartListViewItemDelegate.qml
+++ b/src/mainview/components/ConversationSmartListViewItemDelegate.qml
@@ -122,9 +122,9 @@ ItemDelegate {
}
}
-
Text {
id: conversationSmartListUserLastInteractionMessage
+
anchors.left: conversationSmartListUserImage.right
anchors.leftMargin: 16
anchors.bottom: rowUsernameAndLastInteractionDate.bottom
@@ -139,6 +139,7 @@ ItemDelegate {
text: InCall ? UtilsAdapter.getCallStatusStr(CallState) : (Draft ? Draft : LastInteraction)
}
+ font.family: Qt.platform.os === "windows" ? "Segoe UI Emoji" : Qt.application.font.family
font.hintingPreference: Font.PreferNoHinting
text: textMetricsConversationSmartListUserLastInteractionMessage.elidedText
maximumLineCount: 1
@@ -146,8 +147,6 @@ ItemDelegate {
color: Draft ? JamiTheme.draftRed : JamiTheme.faddedLastInteractionFontColor
}
-
-
background: Rectangle {
id: itemSmartListBackground
color: InCall ? Qt.lighter(JamiTheme.selectionBlue, 1.8) : JamiTheme.backgroundColor
--
GitLab