Kaydet (Commit) f6e2c4eb authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

cleanup Control::ImplInitSettings

Change-Id: Ifb10da3006aa2b546945dec4ba76660c4b3f052f
üst 208616be
......@@ -422,22 +422,22 @@ void Control::ImplInitSettings( const bool _bFont, const bool _bForeground )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if ( _bFont )
if (_bFont)
{
Font aFont( GetCanonicalFont( rStyleSettings ) );
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
Font aFont(GetCanonicalFont(rStyleSettings));
if (IsControlFont())
aFont.Merge(GetControlFont());
SetZoomedPointFont( aFont );
}
if ( _bForeground || _bFont )
if (_bForeground || _bFont)
{
Color aColor;
if ( IsControlForeground() )
if (IsControlForeground())
aColor = GetControlForeground();
else
aColor = GetCanonicalTextColor( rStyleSettings );
SetTextColor( aColor );
aColor = GetCanonicalTextColor(rStyleSettings);
SetTextColor(aColor);
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