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

Fix point size for custom fonts.

Browse source
This commit is contained in:
Julien Wadel 2023-05-04 15:59:53 +02:00
parent 2df3f0fd60
commit a7805cd3f1
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
linphone-app/src/components/settings/SettingsModel.cpp
View file

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

2
linphone-app/src/utils/Constants.cpp
View file

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

2
linphone-app/src/utils/Constants.hpp
View file

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