diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2017-11-11 12:29:26 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-11-16 18:50:28 +0100 |
| commit | fc6231f1d1dd2a4e6f678b8221971e09807d8de8 (patch) | |
| tree | c77ab0678c36432040b5a866cc74b6ab5d9b8f0b /vcl/source | |
| parent | 84e1a01e2d1964a143f5b01fa0b70d9570dcb834 (diff) | |
vcl: StyleSettings - start to unwind code duplication.
This should be a pure re-factor, plus:
switch from Serif -> Sans font default for the UI (wow).
enable larger font size for LOK only
that avoids a hard to debug svx junit test failure.
Change-Id: Id438026064983ea4907819bab55c4be740954605
Reviewed-on: https://gerrit.libreoffice.org/44625
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/settings.cxx | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 9d739341176f..043f36d750bb 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -680,7 +680,7 @@ void ImplStyleData::SetStandardStyles() if (!utl::ConfigManager::IsFuzzing()) aStdFont.SetFamilyName(utl::DefaultFontConfiguration::get().getUserInterfaceFont(LanguageTag("en"))); else - aStdFont.SetFamilyName("Liberation Serif"); + aStdFont.SetFamilyName("Liberation Sans"); maAppFont = aStdFont; maHelpFont = aStdFont; maMenuFont = aStdFont; @@ -3130,4 +3130,21 @@ void StyleSettings::BatchSetBackgrounds( const Color &aBackColor, SetCheckedColorSpecialCase(); } +void StyleSettings::BatchSetFonts( const vcl::Font& aAppFont, + const vcl::Font& aLabelFont ) +{ + SetAppFont( aAppFont ); + SetPushButtonFont( aAppFont ); + SetToolFont( aAppFont ); + SetHelpFont( aAppFont ); + + SetMenuFont( aLabelFont ); + SetTabFont( aLabelFont ); + SetLabelFont( aLabelFont ); + SetRadioCheckFont( aLabelFont ); + SetFieldFont( aLabelFont ); + SetGroupFont( aLabelFont ); + SetIconFont( aLabelFont ); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |