diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2018-02-23 21:27:33 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-02-23 20:47:56 +0100 |
| commit | 7e8d9f156fc6650c49c3312f6f7a7a57abf1f285 (patch) | |
| tree | e4b33f90473d7d49e9025d54e39fba1f771910a8 /sc | |
| parent | 0178d2b7071be32ac2334e0548beae3b4e8dbc7d (diff) | |
lok sc: Post mouse events to main thread
Change-Id: I1311938d7c01d0e3bfd239743e6cb2148da56cdf
Reviewed-on: https://gerrit.libreoffice.org/50253
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/tiledrendering/tiledrendering.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 11c5179622c6..2bb0c660ff69 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -309,6 +309,7 @@ void ScTiledRenderingTest::testSortAscendingDescending() pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, 551, 129, 1, MOUSE_LEFT, 0); pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEMOVE, 820, 1336, 1, MOUSE_LEFT, 0); pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, 820, 1359, 1, MOUSE_LEFT, 0); + Scheduler::ProcessEventsToIdle(); // sort ascending uno::Sequence<beans::PropertyValue> aArgs; @@ -860,6 +861,7 @@ void ScTiledRenderingTest::testGraphicInvalidate() aView.m_bGraphicSelection = false; pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, /*x=*/ 1,/*y=*/ 1,/*count=*/ 1, /*buttons=*/ 1, /*modifier=*/0); pModelObj->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, /*x=*/ 1, /*y=*/ 1, /*count=*/ 1, /*buttons=*/ 1, /*modifier=*/0); + Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT(aView.m_bGraphicSelection); // Drag Drop graphic diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index d191d14ba9a5..ae635323574e 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -677,7 +677,7 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY, int nCount, int nButt switch (nType) { case LOK_MOUSEEVENT_MOUSEBUTTONDOWN: - pGridWindow->MouseButtonDown(aEvent); + Application::PostMouseEvent(VCLEVENT_WINDOW_MOUSEBUTTONDOWN, pGridWindow, &aEvent); // Invoke the context menu if (nButtons & MOUSE_RIGHT) @@ -687,7 +687,7 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY, int nCount, int nButt } break; case LOK_MOUSEEVENT_MOUSEBUTTONUP: - pGridWindow->MouseButtonUp(aEvent); + Application::PostMouseEvent(VCLEVENT_WINDOW_MOUSEBUTTONUP, pGridWindow, &aEvent); // sometimes MouseButtonDown captures mouse and starts tracking, and VCL // will not take care of releasing that with tiled rendering @@ -696,7 +696,7 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY, int nCount, int nButt break; case LOK_MOUSEEVENT_MOUSEMOVE: - pGridWindow->MouseMove(aEvent); + Application::PostMouseEvent(VCLEVENT_WINDOW_MOUSEMOVE, pGridWindow, &aEvent); break; default: assert(false); |