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/win | |
| 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/win')
| -rw-r--r-- | vcl/win/window/salframe.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 725b02e0f232..83c96b69c15c 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -2749,6 +2749,8 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetToolbarIconSize(ToolbarIconSize::Large); + aStyleSettings.BatchSetFonts( aAppFont, aAppFont ); + aStyleSettings.SetMenuFont( aMenuFont ); aStyleSettings.SetTitleFont( aTitleFont ); aStyleSettings.SetFloatTitleFont( aFloatTitleFont ); @@ -2766,12 +2768,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aAppFont.SetFamilyName( aFontName ); } } - aStyleSettings.SetAppFont( aAppFont ); - aStyleSettings.SetGroupFont( aAppFont ); - aStyleSettings.SetLabelFont( aAppFont ); - aStyleSettings.SetRadioCheckFont( aAppFont ); - aStyleSettings.SetPushButtonFont( aAppFont ); - aStyleSettings.SetFieldFont( aAppFont ); + if ( aAppFont.GetWeight() > WEIGHT_NORMAL ) aAppFont.SetWeight( WEIGHT_NORMAL ); aStyleSettings.SetToolFont( aAppFont ); |