diff options
| author | rpmbuild <rpmbuild@fedoraproject.org> | 2016-08-15 15:17:11 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-08 15:34:03 +0000 |
| commit | 02b6a8ae5a0ad4ebb0c929ebf079e01eb76762f8 (patch) | |
| tree | d5b8ae1faf799c6152cbcd83b426da7bfa43e6d0 | |
| parent | 0c0c421f1936417d72d6268aaeee86d119ae8841 (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>
| -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 19570ceb5967..cd89ea5dbc62 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(); |