[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/inc vcl/source

[rpmbuild]

 vcl/inc/helpwin.hxx     |    1 +
 vcl/source/app/help.cxx |   11 +++++++++++
 2 files changed, 12 insertions(+)

New commits:
commit 02b6a8ae5a0ad4ebb0c929ebf079e01eb76762f8
Author: rpmbuild <rpmbuild at fedoraproject.org>
Date:   Mon Aug 15 15:17:11 2016 +0100

    Resolves: tdf#91533 (rhbz#1364335) Tooltips are truncated
    
    Change-Id: Id9ec91ed9652f491e4e2a0556eeed27bf6517002
    (cherry picked from commit e527edf06f8befb45b76ee8ebabe62e6dc885e45)
    Reviewed-on: https://gerrit.libreoffice.org/28220
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index cf35423..db7c10e 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 19570ce..cd89ea5 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();