diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-17 22:56:46 +0900 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-18 11:22:49 +0900 |
commit | b4bbb5e5d7b31caad2fbcc00382ad27df3c81001 (patch) | |
tree | 8ac345712ff92a9b33a7d54651ed27ad88f1ec67 /svtools/source/control/tabbar.cxx | |
parent | 2ca7795a6a723c701f295323fcc3f6c52ad37976 (diff) |
refactor how font, fg. and bg. are applied in widgets/controls
- Move vcl::RenderContext to outdev.
- Change some methods on vcl::Window to accept RenderContext
as parameter.
- Add ApplySettings to vcl::Window - This method is called before
painting. Refactor existing classes that use InitSettings to
have ApplySettings or mark the classes to be refactored later.
- Add RenderSettings for adding defered settings to rendering.
This is similar to ApplySettings but for more ad-hoc calls.
Change-Id: I4ea58461f3b6b08ccfa3e0ddd1a4a3e04f8c4f45
Diffstat (limited to 'svtools/source/control/tabbar.cxx')
-rw-r--r-- | svtools/source/control/tabbar.cxx | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 0b8ca9eaf132..291786f43ca8 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -625,36 +625,31 @@ ImplTabBarItem* TabBar::next() void TabBar::ImplInitSettings( bool bFont, bool bBackground ) { + // FIXME RenderContext + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - if ( bFont ) + if (bFont) { vcl::Font aToolFont; aToolFont = rStyleSettings.GetToolFont(); - if ( IsControlFont() ) - aToolFont.Merge( GetControlFont() ); aToolFont.SetWeight( WEIGHT_BOLD ); - SetZoomedPointFont( aToolFont ); + ApplyControlFont(*this, aToolFont); // Adapt font size if window too small? - while ( GetTextHeight() > (GetOutputSizePixel().Height()-1) ) + while (GetTextHeight() > (GetOutputSizePixel().Height() - 1)) { vcl::Font aFont = GetFont(); - if ( aFont.GetHeight() <= 6 ) + if (aFont.GetHeight() <= 6) break; - aFont.SetHeight( aFont.GetHeight()-1 ); - SetFont( aFont ); + aFont.SetHeight(aFont.GetHeight() - 1); + SetFont(aFont); } } - if ( bBackground ) + if (bBackground) { - Color aColor; - if ( IsControlBackground() ) - aColor = GetControlBackground(); - else - aColor = rStyleSettings.GetFaceColor(); - SetBackground( aColor ); + ApplyControlBackground(*this, rStyleSettings.GetFaceColor()); } } @@ -2173,7 +2168,7 @@ bool TabBar::StartEditMode(sal_uInt16 nPageId) } mpImpl->mpEdit->SetText(GetPageText(mnEditId)); mpImpl->mpEdit->setPosSizePixel(nX, aRect.Top() + mnOffY + 1, nWidth, aRect.GetHeight() - 3); - vcl::Font aFont = GetPointFont(); + vcl::Font aFont = GetPointFont(*this); // FIXME RenderContext Color aForegroundColor; Color aBackgroundColor; |