diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-07-22 11:27:24 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-22 15:08:24 +0000 |
| commit | 94ceda8b2fea37587424b664e17fa9ee8b01e158 (patch) | |
| tree | 5fbb91821ece8c93c60d35dd34bd43a5a91ba9fe | |
| parent | b1760dc3320bfb44568243359124d2615e69e18d (diff) | |
tdf#92600: Restore ability to apply font settings to controls
SmShowSymbol handles font/fg/bg settings by itself, so make
ApplySettings noop there.
This partially reverts commit b010e4074e5d5ee3a3905f1351f04efafe937c2a
Change-Id: Ib5074684ef1277d9b9b4646bd73dce4cbff3943e
Reviewed-on: https://gerrit.libreoffice.org/17288
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/vcl/ctrl.hxx | 2 | ||||
| -rw-r--r-- | starmath/inc/dialog.hxx | 1 | ||||
| -rw-r--r-- | starmath/source/dialog.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/ctrl.cxx | 20 |
4 files changed, 10 insertions, 17 deletions
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index d33982b78da3..0f689d04ebe6 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -41,8 +41,6 @@ protected: private: bool mbHasControlFocus; - bool mbFont; - bool mbForeground; bool mbShowAccelerator; Link<> maGetFocusHdl; Link<> maLoseFocusHdl; diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index a34e5057b353..968d12e70664 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -327,6 +327,7 @@ class SmShowSymbol : public Control Link<> aDblClickHdlLink; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 59a08b59d6a5..70e7f295bd90 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1384,6 +1384,10 @@ void SmShowSymbol::Resize() Invalidate(); } +void SmShowSymbol::ApplySettings(vcl::RenderContext& /*rRenderContext*/ ) +{ +} + void SmShowSymbol::setFontSize(vcl::Font &rFont) const { rFont.SetSize(Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3)); diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 61a1ad787df6..6062d1a49d4d 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -36,8 +36,6 @@ using namespace vcl; void Control::ImplInitControlData() { mbHasControlFocus = false; - mbFont = false; - mbForeground = false; mbShowAccelerator = false; mpControlData = new ImplControlData; } @@ -425,23 +423,15 @@ void Control::ApplySettings(vcl::RenderContext& rRenderContext) { const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); - if (mbFont) - { - vcl::Font rFont(GetCanonicalFont(rStyleSettings)); - ApplyControlFont(rRenderContext, rFont); - } + vcl::Font rFont(GetCanonicalFont(rStyleSettings)); + ApplyControlFont(rRenderContext, rFont); - if (mbFont || mbForeground) - { - ApplyControlForeground(rRenderContext, GetCanonicalTextColor(rStyleSettings)); - rRenderContext.SetTextFillColor(); - } + ApplyControlForeground(rRenderContext, GetCanonicalTextColor(rStyleSettings)); + rRenderContext.SetTextFillColor(); } -void Control::ImplInitSettings(const bool _bFont, const bool _bForeground) +void Control::ImplInitSettings(const bool, const bool) { - mbFont = _bFont; - mbForeground = _bForeground; ApplySettings(*this); } |