vcl/source/window/floatwin.cxx | 6 +++++- vcl/source/window/winproc.cxx | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit 5700f6173c3a7f30011b44d960b10a983726b3ec Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Sat Jul 20 19:17:39 2019 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Mon Dec 9 16:36:37 2019 +0100 lok: show tooltips on dialogs Change-Id: I40fca6ff13cc41ec9e1ec6bba48dce207e364c79 Reviewed-on: https://gerrit.libreoffice.org/84715 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 77aca029ca29..72dff4985c34 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 99fefdeece20..56ffa108812d 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -160,9 +160,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 ) || _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits