Skip to content
Snippets Groups Projects
Commit dd1f5793 authored by Ming Rui Zhang's avatar Ming Rui Zhang Committed by Andreas Traczyk
Browse files

misc: use Segoe UI Emoji font in the last interaction text for windows

Change-Id: I0a6124ebe6a07fd6c89cfcd267b67ab78817ec5c
parent 063cc586
No related branches found
No related tags found
No related merge requests found
...@@ -122,9 +122,9 @@ ItemDelegate { ...@@ -122,9 +122,9 @@ ItemDelegate {
} }
} }
Text { Text {
id: conversationSmartListUserLastInteractionMessage id: conversationSmartListUserLastInteractionMessage
anchors.left: conversationSmartListUserImage.right anchors.left: conversationSmartListUserImage.right
anchors.leftMargin: 16 anchors.leftMargin: 16
anchors.bottom: rowUsernameAndLastInteractionDate.bottom anchors.bottom: rowUsernameAndLastInteractionDate.bottom
...@@ -139,6 +139,7 @@ ItemDelegate { ...@@ -139,6 +139,7 @@ ItemDelegate {
text: InCall ? UtilsAdapter.getCallStatusStr(CallState) : (Draft ? Draft : LastInteraction) 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 font.hintingPreference: Font.PreferNoHinting
text: textMetricsConversationSmartListUserLastInteractionMessage.elidedText text: textMetricsConversationSmartListUserLastInteractionMessage.elidedText
maximumLineCount: 1 maximumLineCount: 1
...@@ -146,8 +147,6 @@ ItemDelegate { ...@@ -146,8 +147,6 @@ ItemDelegate {
color: Draft ? JamiTheme.draftRed : JamiTheme.faddedLastInteractionFontColor color: Draft ? JamiTheme.draftRed : JamiTheme.faddedLastInteractionFontColor
} }
background: Rectangle { background: Rectangle {
id: itemSmartListBackground id: itemSmartListBackground
color: InCall ? Qt.lighter(JamiTheme.selectionBlue, 1.8) : JamiTheme.backgroundColor color: InCall ? Qt.lighter(JamiTheme.selectionBlue, 1.8) : JamiTheme.backgroundColor
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment