Skip to content

C
core
Kaydet (Commit) f6e2c4eb authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl
Dosyalara gözat
Seçenekler

cleanup Control::ImplInitSettings 

Change-Id: Ifb10da3006aa2b546945dec4ba76660c4b3f052f
üst 208616be
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
vcl/source/control/ctrl.cxx
Dosyayı görüntüle @ f6e2c4eb
...@@ -422,22 +422,22 @@ void Control::ImplInitSettings( const bool _bFont, const bool _bForeground ) ...@@ -422,22 +422,22 @@ void Control::ImplInitSettings( const bool _bFont, const bool _bForeground )
{ {
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if ( _bFont ) if (_bFont)
{ {
Font aFont( GetCanonicalFont( rStyleSettings ) ); Font aFont(GetCanonicalFont(rStyleSettings));
if ( IsControlFont() ) if (IsControlFont())
aFont.Merge( GetControlFont() ); aFont.Merge(GetControlFont());
SetZoomedPointFont( aFont ); SetZoomedPointFont( aFont );
} }
if ( _bForeground || _bFont ) if (_bForeground || _bFont)
{ {
Color aColor; Color aColor;
if ( IsControlForeground() ) if (IsControlForeground())
aColor = GetControlForeground(); aColor = GetControlForeground();
else else
aColor = GetCanonicalTextColor( rStyleSettings ); aColor = GetCanonicalTextColor(rStyleSettings);
SetTextColor( aColor ); SetTextColor(aColor);
SetTextFillColor(); SetTextFillColor();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment