diff options
author | rpmbuild <rpmbuild@fedoraproject.org> | 2016-08-15 15:17:11 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2016-09-20 23:05:06 +0200 |
commit | 361d393065cdb1fb0313bb571228b3edd7ef4886 (patch) | |
tree | a90b80c1230fde99042bd3afbd9c67965c126404 /vcl | |
parent | aef5dcde285bfed3feb94488b98f86ed840d49c5 (diff) |
Change-Id: Id9ec91ed9652f491e4e2a0556eeed27bf6517002
(cherry picked from commit e527edf06f8befb45b76ee8ebabe62e6dc885e45)
Reviewed-on: https://gerrit.libreoffice.org/28220
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 02b6a8ae5a0ad4ebb0c929ebf079e01eb76762f8)
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/helpwin.hxx | 1 | ||||
-rw-r--r-- | vcl/source/app/help.cxx | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index cf35423e262b..db7c10ed8ba5 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -49,6 +49,7 @@ private: virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; + virtual void StateChanged(StateChangedType nType) override; virtual OUString GetText() const override; void ImplShow(); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 4f9e3e737cda..6d163322afb2 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -260,6 +260,17 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal maHideTimer.SetTimeout( rHelpSettings.GetTipTimeout() ); } +void HelpTextWindow::StateChanged(StateChangedType nType) +{ + FloatingWindow::StateChanged(nType); + if (nType == StateChangedType::InitShow) + { + ApplySettings(*this); + SetHelpText(maHelpText); + Invalidate(); + } +} + void HelpTextWindow::ApplySettings(vcl::RenderContext& rRenderContext) { const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); |