From b90d284b08d9693d1ea616f7396b5413b66cc3ca Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 5 May 2023 16:43:34 +0200 Subject: [PATCH] ContextView: Check for default font family --- src/context/contextview.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/context/contextview.cpp b/src/context/contextview.cpp index 3158cc7e3..b513ea014 100644 --- a/src/context/contextview.cpp +++ b/src/context/contextview.cpp @@ -330,6 +330,14 @@ void ContextView::AddActions() { void ContextView::ReloadSettings() { + QString default_font; + if (QFontDatabase::families().contains(ContextSettingsPage::kDefaultFontFamily)) { + default_font = ContextSettingsPage::kDefaultFontFamily; + } + else { + default_font = font().family(); + } + QSettings s; s.beginGroup(ContextSettingsPage::kSettingsGroup); title_fmt_ = s.value(ContextSettingsPage::kSettingsTitleFmt, "%title% - %artist%").toString(); @@ -339,11 +347,11 @@ void ContextView::ReloadSettings() { action_show_output_->setChecked(s.value(ContextSettingsPage::kSettingsGroupEnable[static_cast(ContextSettingsPage::ContextSettingsOrder::ENGINE_AND_DEVICE)], false).toBool()); action_show_lyrics_->setChecked(s.value(ContextSettingsPage::kSettingsGroupEnable[static_cast(ContextSettingsPage::ContextSettingsOrder::SONG_LYRICS)], true).toBool()); action_search_lyrics_->setChecked(s.value(ContextSettingsPage::kSettingsGroupEnable[static_cast(ContextSettingsPage::ContextSettingsOrder::SEARCH_LYRICS)], true).toBool()); - font_headline_.setFamily(s.value("font_headline", font().family()).toString()); + font_headline_.setFamily(s.value("font_headline", default_font).toString()); font_headline_.setPointSizeF(s.value("font_size_headline", ContextSettingsPage::kDefaultFontSizeHeadline).toReal()); font_nosong_.setFamily(font_headline_.family()); font_nosong_.setPointSizeF(font_headline_.pointSizeF() * 1.6F); - font_normal_.setFamily(s.value("font_normal", font().family()).toString()); + font_normal_.setFamily(s.value("font_normal", default_font).toString()); font_normal_.setPointSizeF(s.value("font_size_normal", font().pointSizeF()).toReal()); s.endGroup();