From a7805cd3f1263794a80f8e947d5827519d2c9640 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Thu, 4 May 2023 15:59:53 +0200
Subject: [PATCH] Fix point size for custom fonts.

---
 .../src/components/settings/SettingsModel.cpp | 23 +++++++++++++------
 linphone-app/src/utils/Constants.cpp          |  2 ++
 linphone-app/src/utils/Constants.hpp          |  2 ++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp
index 4eea12fed..fc21fe3f1 100644
--- a/linphone-app/src/components/settings/SettingsModel.cpp
+++ b/linphone-app/src/components/settings/SettingsModel.cpp
@@ -1481,17 +1481,21 @@ QFont SettingsModel::getTextMessageFont() const{
 
 void SettingsModel::setTextMessageFont(const QFont& font){
 	QString family;
-	if(font == QFont())
+	int pointSize;
+	if(font == QFont()){
 		family = Constants::DefaultFont;
-	else
+		pointSize = Constants::DefaultFontPointSize;
+	}else{
 		family = font.family();
+		pointSize = font.pointSize();
+	}
 	mConfig->setString(UiSection, "text_message_font", Utils::appStringToCoreString(family));
-	setTextMessageFontSize(font.pointSize());
+	setTextMessageFontSize(pointSize);
 	emit textMessageFontChanged(font);
 }
 
 int SettingsModel::getTextMessageFontSize() const{
-	return mConfig->getInt(UiSection, "text_message_font_size", 10);
+	return mConfig->getInt(UiSection, "text_message_font_size", Constants::DefaultFontPointSize);
 }
 
 void SettingsModel::setTextMessageFontSize(const int& size){
@@ -1507,16 +1511,21 @@ QFont SettingsModel::getEmojiFont() const{
 
 void SettingsModel::setEmojiFont(const QFont& font){
 	QString family;
-	if(font == QFont())
+	int pointSize;
+	if(font == QFont()){
 		family = Constants::DefaultEmojiFont;
-	else
+		pointSize = Constants::DefaultEmojiFontPointSize;
+	}else{
 		family = font.family();
+		pointSize = font.pointSize();
+	}
 	mConfig->setString(UiSection, "emoji_font", Utils::appStringToCoreString(family));
+	setEmojiFontSize(pointSize);
 	emit emojiFontChanged(font);
 }
 
 int SettingsModel::getEmojiFontSize() const{
-	return mConfig->getInt(UiSection, "emoji_font_size", 10);
+	return mConfig->getInt(UiSection, "emoji_font_size", Constants::DefaultEmojiFontPointSize);
 }
 
 void SettingsModel::setEmojiFontSize(const int& size){
diff --git a/linphone-app/src/utils/Constants.cpp b/linphone-app/src/utils/Constants.cpp
index 67d39fd14..ad905b756 100644
--- a/linphone-app/src/utils/Constants.cpp
+++ b/linphone-app/src/utils/Constants.cpp
@@ -23,7 +23,9 @@ constexpr char Constants::AssistantViewName[];
 
 constexpr char Constants::ApplicationMinimalQtVersion[];
 constexpr char Constants::DefaultFont[];
+constexpr int Constants::DefaultFontPointSize;
 constexpr char Constants::DefaultEmojiFont[];
+constexpr int Constants::DefaultEmojiFontPointSize;
 
 constexpr char Constants::QtDomain[];
 constexpr size_t Constants::MaxLogsCollectionSize;
diff --git a/linphone-app/src/utils/Constants.hpp b/linphone-app/src/utils/Constants.hpp
index 471b374a7..d0d820eae 100644
--- a/linphone-app/src/utils/Constants.hpp
+++ b/linphone-app/src/utils/Constants.hpp
@@ -38,7 +38,9 @@ public:
 	
 	static constexpr char DefaultLocale[] = "en";
 	static constexpr char DefaultFont[] = "Noto Sans";
+	static constexpr int DefaultFontPointSize = 10;
 	static constexpr char DefaultEmojiFont[] = "Noto Color Emoji";
+	static constexpr int DefaultEmojiFontPointSize = 10;
 	
 	static constexpr size_t MaxLogsCollectionSize = 10485760*5; // 50MB.