summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/UserSettingsPage.cpp3
-rw-r--r--src/UserSettingsPage.h5
2 files changed, 4 insertions, 4 deletions
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index bf1bdb86..f0d35aa6 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -741,8 +741,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
fontSelectionCombo_->setCurrentIndex(
fontSelectionCombo_->findText(tr(currentFont.toStdString().c_str())));
} else {
- fontSelectionCombo_->setCurrentIndex(
- fontSelectionCombo_->findText(currentFont));
+ fontSelectionCombo_->setCurrentIndex(fontSelectionCombo_->findText(currentFont));
}
emojiFontSelectionCombo_->setCurrentIndex(
diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h
index ab82c282..49de94b3 100644
--- a/src/UserSettingsPage.h
+++ b/src/UserSettingsPage.h
@@ -177,12 +177,13 @@ public:
int timelineMaxWidth() const { return timelineMaxWidth_; }
double fontSize() const { return baseFontSize_; }
QString font() const { return font_; }
- QString emojiFont() const {
+ QString emojiFont() const
+ {
if (emojiFont_ == "Default") {
return tr("Default");
}
- return emojiFont_;
+ return emojiFont_;
}
Presence presence() const { return presence_; }
QString ringtone() const { return ringtone_; }