diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2020-04-07 10:31:51 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2020-04-07 18:17:00 +0200 |
| commit | bbcf587faa73d8ec7242f287421337b247b51cc5 (patch) | |
| tree | 2d8e06f684900118edb78cf2ca76eb70018220de /vcl | |
| parent | b834f5fe933c0876ce61d8550a0d6144e098876f (diff) | |
lok: Use a different window type for tooltips.
Change-Id: I211cd6bc2249475dbacd80f944e22465b19aff77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91837
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 0ef5125e92c7..006ac60caaa7 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -21,6 +21,7 @@ #include <brdwin.hxx> #include <window.h> #include <salframe.hxx> +#include <helpwin.hxx> #include <comphelper/lok.hxx> #include <sal/log.hxx> @@ -653,7 +654,11 @@ void FloatingWindow::StateChanged( StateChangedType nType ) else { SetLOKNotifier(pParent->GetLOKNotifier()); - aItems.emplace_back("type", "child"); + if (dynamic_cast<HelpTextWindow*>(this)) + aItems.emplace_back("type", "tooltip"); + else + aItems.emplace_back("type", "child"); + aItems.emplace_back("parentId", OString::number(pParent->GetLOKWindowId())); if (mbInPopupMode) aItems.emplace_back("position", mpImplData->maPos.toString()); // pixels diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 8377691e1527..31620bc6a0ac 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -160,16 +160,6 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePo static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& rMousePos ) { - if (comphelper::LibreOfficeKit::isActive()) - { - // Ignore tooltips in popup color pallets - // (e.g. Character Properties dialog -> Font Effects -> Font Color) - if(pChild->GetType() == WindowType::CONTROL && - pChild->GetParent() && pChild->GetParent()->GetParent() && - pChild->GetParent()->GetParent()->GetType() == WindowType::SCROLLWINDOW) - return; - } - ImplSVHelpData& aHelpData = ImplGetSVHelpData(); if ( !aHelpData.mpHelpWin || !( aHelpData.mpHelpWin->IsWindowOrChild( pChild ) || |