From 802ecc92d2ac9c0dd32687b5d9e535f6b1618652 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Thu, 5 May 2022 18:32:34 +0200 Subject: Simplify custom font settings Instead of having 3 separate config keys, use the KConfig QFont de/serilaization. --- src/settings/viewmodes/viewmodesettings.cpp | 52 +++-------------------------- 1 file changed, 5 insertions(+), 47 deletions(-) (limited to 'src/settings/viewmodes/viewmodesettings.cpp') diff --git a/src/settings/viewmodes/viewmodesettings.cpp b/src/settings/viewmodes/viewmodesettings.cpp index 8c11bde5b..73a91a272 100644 --- a/src/settings/viewmodes/viewmodesettings.cpp +++ b/src/settings/viewmodes/viewmodesettings.cpp @@ -86,59 +86,17 @@ bool ViewModeSettings::useSystemFont() const }, m_viewModeSettingsVariant); } -void ViewModeSettings::setFontFamily(const QString &fontFamily) +void ViewModeSettings::setViewFont(const QFont &font) { - std::visit([&fontFamily](auto &&v) { - v->setFontFamily(fontFamily); + std::visit([&font](auto &&v) { + v->setViewFont(font); }, m_viewModeSettingsVariant); } -QString ViewModeSettings::fontFamily() const +QFont ViewModeSettings::viewFont() const { return std::visit([](auto &&v) { - return v->fontFamily(); - }, m_viewModeSettingsVariant); -} - -void ViewModeSettings::setFontSize(qreal fontSize) -{ - std::visit([fontSize](auto &&v) { - v->setFontSize(fontSize); - }, m_viewModeSettingsVariant); -} - -qreal ViewModeSettings::fontSize() const -{ - return std::visit([](auto &&v) { - return v->fontSize(); - }, m_viewModeSettingsVariant); -} - -void ViewModeSettings::setItalicFont(bool italic) -{ - std::visit([italic](auto &&v) { - v->setItalicFont(italic); - }, m_viewModeSettingsVariant); -} - -bool ViewModeSettings::italicFont() const -{ - return std::visit([](auto &&v) { - return v->italicFont(); - }, m_viewModeSettingsVariant); -} - -void ViewModeSettings::setFontWeight(int fontWeight) -{ - std::visit([fontWeight](auto &&v) { - v->setFontWeight(fontWeight); - }, m_viewModeSettingsVariant); -} - -int ViewModeSettings::fontWeight() const -{ - return std::visit([](auto &&v) { - return v->fontWeight(); + return v->viewFont(); }, m_viewModeSettingsVariant); } -- cgit v1.3