diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-07-20 19:17:39 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-12-10 14:14:04 +0100 |
| commit | 63e5dc938e1a907f92b88433d613d50c1573450b (patch) | |
| tree | bb7ab04c35a478f9ad41ac9d906d5c62dd1d7ce3 /vcl/source | |
| parent | e6271a8a4eafcbb357bbd3cf21126f64b45125e9 (diff) | |
lok: show tooltips on dialogs
Change-Id: I40fca6ff13cc41ec9e1ec6bba48dce207e364c79
Reviewed-on: https://gerrit.libreoffice.org/84715
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/84801
Tested-by: Jenkins
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index baa3a46bc978..672eb6236fee 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -651,7 +651,11 @@ void FloatingWindow::StateChanged( StateChangedType nType ) SetLOKNotifier(pParent->GetLOKNotifier()); aItems.emplace_back("type", "child"); aItems.emplace_back("parentId", OString::number(pParent->GetLOKWindowId())); - aItems.emplace_back("position", mpImplData->maPos.toString()); // pixels + if (mbInPopupMode) + aItems.emplace_back("position", mpImplData->maPos.toString()); // pixels + else // mpImplData->maPos is not set + aItems.emplace_back("position", GetPosPixel().toString()); + } aItems.emplace_back("size", GetSizePixel().toString()); GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", aItems); diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index ec1228b9fe69..62214fac59e4 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -157,9 +157,6 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePo static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& rMousePos ) { - if (comphelper::LibreOfficeKit::isActive()) - return; - ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maHelpData.mpHelpWin || !( pSVData->maHelpData.mpHelpWin->IsWindowOrChild( pChild ) || |