diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-10-18 12:43:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-10-25 17:33:03 +0200 |
| commit | 9a6966c913e5301101456a3df8b8cd96a8e5588c (patch) | |
| tree | fd286e5143f2cff90661ae19962389ec37900627 | |
| parent | c2af4edf5e25a956e30580be86e4ddc090602892 (diff) | |
tdf#112830 measure test with ApplySettings applied
and don't invalidate on first view
Change-Id: I1156c83c0365ef27946cc414cad8dfa07206e5af
Reviewed-on: https://gerrit.libreoffice.org/43498
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 660b12e47d3aedb8fcf2ed2c50f8175d351a51aa)
Reviewed-on: https://gerrit.libreoffice.org/43645
| -rw-r--r-- | vcl/inc/helpwin.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/app/help.cxx | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index c2d068c1c79e..09fed59b7138 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -47,7 +47,6 @@ private: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::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 29221658c2e2..3d6eec421fb8 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -281,17 +281,6 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal maHideTimer.SetDebugName( "vcl::HelpTextWindow maHideTimer" ); } -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(); @@ -334,6 +323,7 @@ void HelpTextWindow::dispose() void HelpTextWindow::SetHelpText( const OUString& rHelpText ) { maHelpText = rHelpText; + ApplySettings(*this); if ( mnHelpWinStyle == HELPWINSTYLE_QUICK && maHelpText.getLength() < HELPTEXTMAXLEN) { Size aSize; |