X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Ffontssettingspage.cpp;fp=src%2Fqtui%2Fsettingspages%2Ffontssettingspage.cpp;h=d64fdfc897aa8a67f6b42022c0b65bee51631e74;hp=3a9843e3e4c268d802253eb68496d7550f6f8988;hb=a18660ee87e81b6f4072537be3aa10c93a243b2a;hpb=f6f6f3e368543f0a4dce1dae772f161d7e357064

diff --git a/src/qtui/settingspages/fontssettingspage.cpp b/src/qtui/settingspages/fontssettingspage.cpp
index 3a9843e3..d64fdfc8 100644
--- a/src/qtui/settingspages/fontssettingspage.cpp
+++ b/src/qtui/settingspages/fontssettingspage.cpp
@@ -92,16 +92,18 @@ void FontsSettingsPage::save() {
   QTextCharFormat chatFormat = QtUi::style()->format(UiStyle::None);
   chatFormat.setFont(ui.demoChatMessages->font());
   QtUi::style()->setFormat(UiStyle::None, chatFormat, Settings::Custom);
-  if(ui.checkNicks->checkState() == Qt::Checked) {
-    QTextCharFormat nicksFormat = QtUi::style()->format(UiStyle::Sender);
-    nicksFormat.setFont(ui.demoNicks->font());
-    QtUi::style()->setFormat(UiStyle::Sender, nicksFormat, Settings::Custom);
-  }
-  if(ui.checkTimestamp->checkState() == Qt::Checked) {
-    QTextCharFormat timestampFormat = QtUi::style()->format(UiStyle::Timestamp);
-    timestampFormat.setFont(ui.demoTimestamp->font());
-    QtUi::style()->setFormat(UiStyle::Timestamp, timestampFormat, Settings::Custom);
-  }
+
+  //FIXME: actually remove font properties from the formats
+  QTextCharFormat nicksFormat = QtUi::style()->format(UiStyle::Sender);
+  if(ui.checkNicks->checkState() == Qt::Checked) nicksFormat.setFont(ui.demoNicks->font());
+  else nicksFormat.setFont(chatFormat.font());
+  QtUi::style()->setFormat(UiStyle::Sender, nicksFormat, Settings::Custom);
+
+  QTextCharFormat timestampFormat = QtUi::style()->format(UiStyle::Timestamp);
+  if(ui.checkTimestamp->checkState() == Qt::Checked) timestampFormat.setFont(ui.demoTimestamp->font());
+  else timestampFormat.setFont(chatFormat.font());
+  QtUi::style()->setFormat(UiStyle::Timestamp, timestampFormat, Settings::Custom);
+
   changeState(false);
 }