[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source

[Henry Castro (via logerrit)]

 vcl/source/window/mouse.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d7ef45f32caa8c91e662fda5890ffec24875b07e
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue Jun 29 20:15:36 2021 -0400
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Oct 7 11:49:08 2021 +0200

    lok: fix sending mouse pointer
    
    The ScGridWindow is a document window, but the Parent
    is not the notifier, fix it to send mouse pointer when
    action is drag & drop.
    
    Change-Id: I5071dce2566331ce0268a96e023ffd61a1f09e56
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118870
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 9e2cd5045392..717713a68952 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -510,8 +510,10 @@ void Window::SetPointer( PointerStyle nPointer )
     // issue mouse pointer events only for document windows
     // Doc windows' immediate parent SfxFrameViewWindow_Impl is the one with
     // parent notifier set during initialization
-    if (GetParent()->ImplGetWindowImpl()->mbLOKParentNotifier &&
-        GetParent()->ImplGetWindowImpl()->mnLOKWindowId == 0)
+    if ((ImplGetFrameData()->mbDragging &&
+         ImplGetFrameData()->mpMouseDownWin == this) ||
+        (GetParent()->ImplGetWindowImpl()->mbLOKParentNotifier &&
+         GetParent()->ImplGetWindowImpl()->mnLOKWindowId == 0))
     {
         pWin->GetLOKNotifier()->libreOfficeKitViewCallback(LOK_CALLBACK_MOUSE_POINTER, aPointerString.getStr());
     }