|
 |
f325b2 |
From 2d7b2c6357d478b83fce8f457305e7c2932c4656 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: rpmbuild <rpmbuild@fedoraproject.org>
|
|
|
f325b2 |
Date: Mon, 15 Aug 2016 15:17:11 +0100
|
|
|
f325b2 |
Subject: [PATCH] Resolves: rhbz#1364335 tooltips are truncated
|
|
|
f325b2 |
|
|
|
f325b2 |
---
|
|
|
f325b2 |
vcl/inc/helpwin.hxx | 1 +
|
|
|
f325b2 |
vcl/source/app/help.cxx | 11 +++++++++++
|
|
|
f325b2 |
2 files changed, 12 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
|
|
|
f325b2 |
index 5889a4f..def965d 100644
|
|
|
f325b2 |
--- a/vcl/inc/helpwin.hxx
|
|
|
f325b2 |
+++ b/vcl/inc/helpwin.hxx
|
|
|
f325b2 |
@@ -49,6 +49,7 @@ protected:
|
|
|
f325b2 |
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
|
|
|
f325b2 |
virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
|
|
|
f325b2 |
virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
|
|
|
f325b2 |
+ virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE;
|
|
|
f325b2 |
|
|
|
f325b2 |
virtual OUString GetText() const SAL_OVERRIDE;
|
|
|
f325b2 |
void ImplShow();
|
|
|
f325b2 |
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
|
|
|
f325b2 |
index 7014a79..13b0c24 100644
|
|
|
f325b2 |
--- a/vcl/source/app/help.cxx
|
|
|
f325b2 |
+++ b/vcl/source/app/help.cxx
|
|
|
f325b2 |
@@ -269,6 +269,17 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal
|
|
|
f325b2 |
maHideTimer.SetTimeout( rHelpSettings.GetTipTimeout() );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
+void HelpTextWindow::StateChanged(StateChangedType nType)
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ FloatingWindow::StateChanged(nType);
|
|
|
f325b2 |
+ if (nType == StateChangedType::InitShow)
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ ApplySettings(*this);
|
|
|
f325b2 |
+ SetHelpText(maHelpText);
|
|
|
f325b2 |
+ Invalidate();
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
void HelpTextWindow::ApplySettings(vcl::RenderContext& rRenderContext)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
|
|
|
f325b2 |
--
|
|
|
f325b2 |
1.8.3.1
|
|
|
f325b2 |
|