mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix font size that could be different on Mac (and other platforms with pixel density different of 1)

Browse source
This commit is contained in:
Julien Wadel 2023-06-06 10:40:05 +02:00
parent 23deae58a4
commit 34bcb9283a
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
linphone-app/ui/modules/Common/Form/DroppableTextArea.qml
View file

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

10
linphone-app/ui/modules/Common/Picker/EmojiPicker.qml
View file

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

2
linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
View file

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