include/sfx2/thumbnailview.hxx | 2 ++ sfx2/source/control/thumbnailview.cxx | 13 +++++++++++++ sfx2/source/doc/doc.src | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-)
New commits: commit 2decee2ccd9a4167949843da0db99edaebe6acd8 Author: Maxim Monastirsky <momonas...@gmail.com> Date: Wed Aug 31 19:14:27 2016 +0300 tdf#101779 Allow multiline tooltips in template manager Change-Id: Ia3dc45fc35aeeabfabc119bb84847c479ed32fda diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index bd08a57..13621cb 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -187,6 +187,8 @@ public: virtual void MouseMove(const MouseEvent& rMEvt) override; + virtual void RequestHelp(const HelpEvent& rHEvt) override; + void AppendItem(ThumbnailViewItem *pItem); void RemoveItem(sal_uInt16 nItemId); diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index a6a48e8..c0d4c37 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -109,6 +109,19 @@ void ThumbnailView::MouseMove(const MouseEvent& rMEvt) SetQuickHelpText(aHelp); } +void ThumbnailView::RequestHelp( const HelpEvent& rHEvt ) +{ + if ( rHEvt.GetMode() & HelpEventMode::QUICK ) + { + // Force balloon mode, to be able to use line break. + HelpEvent aNewEvent( rHEvt.GetMousePosPixel(), HelpEventMode::BALLOON ); + Control::RequestHelp( aNewEvent ); + return; + } + + Control::RequestHelp( rHEvt ); +} + void ThumbnailView::AppendItem(ThumbnailViewItem *pItem) { if (maFilterFunc(pItem)) commit 89a0365082e6ba9c255c2f7d69b537bb9936d848 Author: Maxim Monastirsky <momonas...@gmail.com> Date: Wed Aug 31 20:21:04 2016 +0300 Revert "tdf#101440 Better rendering of tooltip in gtk2 and windows" See tdf#101779 for a proper fix. This reverts commit c505ec78ddf97fbcb6e39b7865df5a455d41bf38. Change-Id: Ie825c1d2d8b4ab5696078da95c1b7f3fc699b2cb diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src index 644bfa9..ef60bff 100644 --- a/sfx2/source/doc/doc.src +++ b/sfx2/source/doc/doc.src @@ -86,7 +86,7 @@ String STR_RENAME_TEMPLATE }; String STR_TEMPLATE_TOOLTIP { - Text [ en-US ] = "Title: $1 \nCategory: $2" ; + Text [ en-US ] = "Title: $1\nCategory: $2" ; }; String STR_TEMPLATE_SELECTION { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits