[Libreoffice-commits] core.git: include/vcl

[Caolán McNamara (via logerrit)]

 include/vcl/layout.hxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d6d82d3f2b4a468e4ca432c964f0923ce289d862
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon May 20 14:18:56 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon May 20 21:11:06 2019 +0200

    Resolves: tdf#125369 recover newline support of tdf#101779
    
    Change-Id: Ia46fc89f056c714e9a06c48e980277025fb16a61
    Reviewed-on: https://gerrit.libreoffice.org/72602
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 2ea881a31fd6..cb031a0efe3b 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -696,7 +696,9 @@ private:
             aPt = OutputToScreenPixel(aHelpArea.BottomRight());
             aHelpArea.SetRight(aPt.X());
             aHelpArea.SetBottom(aPt.Y());
-            Help::ShowQuickHelp(this, aHelpArea, sHelpTip);
+            // tdf#125369 recover newline support of tdf#101779
+            QuickHelpFlags eHelpWinStyle = sHelpTip.indexOf('\n') != -1 ? QuickHelpFlags::TipStyleBalloon : QuickHelpFlags::NONE;
+            Help::ShowQuickHelp(this, aHelpArea, sHelpTip, eHelpWinStyle);
         }
     }
     virtual FactoryFunction GetUITestFactory() const override