diff --git a/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml index 459c4d91d..c484a6ec3 100644 --- a/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml +++ b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml @@ -6,6 +6,7 @@ import QtQuick.Layouts 1.12 import Common 1.0 import Linphone 1.0 import Common.Styles 1.0 +import Units 1.0 import Utils 1.0 import UtilsCpp 1.0 @@ -174,7 +175,7 @@ Item { color: DroppableTextAreaStyle.text.colorModel.color property font customFont : SettingsModel.textMessageFont - font.pointSize: customFont.pointSize + font.pointSize: Units.dp * customFont.pointSize font.family: customFont.family textFormat: TextEdit.RichText rightPadding: fileChooserButton.width + diff --git a/linphone-app/ui/modules/Common/Picker/EmojiPicker.qml b/linphone-app/ui/modules/Common/Picker/EmojiPicker.qml index 14242de66..a6f66a45c 100644 --- a/linphone-app/ui/modules/Common/Picker/EmojiPicker.qml +++ b/linphone-app/ui/modules/Common/Picker/EmojiPicker.qml @@ -108,7 +108,7 @@ Item{ //: 'Last used' : Emoji title for last used section. text: qsTr('emojisLastUsed') property font customFont : SettingsModel.textMessageFont - font.pointSize: customFont.pointSize + font.pointSize: Units.dp * customFont.pointSize font.family: customFont.family font.weight: Font.Bold visible: gridPreferred.model.length > 0 @@ -142,7 +142,7 @@ Item{ height: gridPreferred.emojiSize width: gridPreferred.emojiSize Layout.alignment: Qt.AlignTop | Qt.AlignLeft - font.pointSize: 20 + font.pointSize: Units.dp * 20 font.family: customFont.family property int code: gridPreferred.model[index] property string stringCodePoint: code >=0 ? String.fromCodePoint(code) : '' @@ -169,7 +169,7 @@ Item{ //: 'All' Emoji title for all items. text: qsTr('emojisAll') property font customFont : SettingsModel.textMessageFont - font.pointSize: customFont.pointSize + font.pointSize: Units.dp * customFont.pointSize font.family: customFont.family font.weight: Font.Bold } @@ -200,7 +200,7 @@ Item{ height: grid.emojiSize width: grid.emojiSize Layout.alignment: Qt.AlignTop | Qt.AlignLeft - font.pointSize: 20 + font.pointSize: Units.dp * 20 font.family: customFont.family property int code: mainItem.getEmojiCode(index) property string stringCodePoint: code >=0 ? String.fromCodePoint(code) : '' @@ -250,7 +250,7 @@ Item{ height: grid.emojiSize width: grid.emojiSize Layout.alignment: Qt.AlignTop | Qt.AlignLeft - font.pointSize: 20 + font.pointSize: Units.dp * 20 font.family: customFont.family property int code: mainItem.getEmojiCode(index+grid.auxItemsCount) property string stringCodePoint: code >=0 ? String.fromCodePoint(code) : '' diff --git a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml index 4a8cd86c8..6aea629ea 100644 --- a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml +++ b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml @@ -48,7 +48,7 @@ Avatar { color: CallStyle.container.pause.text.colorModel.color // `|| 1` => `pointSize` must be greater than 0. - font.pointSize: (width / CallStyle.container.pause.text.pointSizeFactor) || 1 + font.pointSize: Units.dp * (width / CallStyle.container.pause.text.pointSizeFactor) || 1 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter