[Libreoffice-commits] core.git: include/vcl

Jan Holesovsky kendy at collabora.com
Fri Mar 2 10:56:46 UTC 2018


 include/vcl/ITiledRenderable.hxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 82d38099a3f152590074851fe28401709a10a48f
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Feb 27 06:49:24 2018 +0100

    lok: Re-introduce the cancellation of tracking.
    
    Without this, the charts tend to crash on double-click.
    
    This kind of reverts commit 86ea687d3f19c04192ee2b7a82736e110c7be334.
    
    Change-Id: I462e4beec71008a0abe29ec0bb570c8a35c82a7f
    Reviewed-on: https://gerrit.libreoffice.org/50408
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/50481
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 9b0e7dbe8e3a..b95ac6386829 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -120,6 +120,12 @@ public:
             break;
         case VclEventId::WindowMouseButtonUp:
             pLOKEv->mpWindow->LogicMouseButtonUp(pLOKEv->maMouseEvent);
+
+            // sometimes MouseButtonDown captures mouse and starts tracking, and VCL
+            // will not take care of releasing that with tiled rendering
+            if (pLOKEv->mpWindow->IsTracking())
+                pLOKEv->mpWindow->EndTracking(TrackingEventFlags::DontCallHdl);
+
             break;
         case VclEventId::WindowMouseMove:
             pLOKEv->mpWindow->LogicMouseMove(pLOKEv->maMouseEvent);


More information about the Libreoffice-commits mailing list