summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-15 21:05:50 +0100
committerAndras Timar <andras.timar@collabora.com>2016-06-18 20:54:19 +0200
commit77ef7cb4af0ab0188b56d7794758d4bf84974d14 (patch)
treec471f132cdbdf03b4a6e3d2e08819eb0ab6fc8c5 /vcl/source/window
parent23da46252a351c2abbf7c41f6f27db4205e8d615 (diff)
crashreport: 644837b5-c445-4779-a75d-dd69fc2e3a6f
drop hint of previous window to get mouse wheel event when that window is disposed in order to drop any references to it immediately that happens to avoid anything else lingering too late move the VclPtr into ImplSVData alongside the rest of the things like this so we can remove the static VclPtr which itself replaced a relatively harmless static Window* (cherry picked from commit bdfccfde308f0267965933a8273e6e9201a2c67c) (cherry picked from commit 35205c6e3e2f85d9b7db935689ec949c98e7e431) Change-Id: I1e172071b711b6e4ded9a813ee3de730d3dfdf38 Reviewed-on: https://gerrit.libreoffice.org/26337 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f7ad46993279d1da56980fc100b3961e5e349400)
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/window.cxx4
-rw-r--r--vcl/source/window/winproc.cxx11
2 files changed, 10 insertions, 5 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index bd2a66249877..2c4164eae76a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -481,6 +481,10 @@ void Window::dispose()
if( pSVData->maWinData.mpActiveApplicationFrame == this )
pSVData->maWinData.mpActiveApplicationFrame = nullptr;
+ // reset hint of what was the last wheeled window
+ if( pSVData->maWinData.mpLastWheelWindow == this )
+ pSVData->maWinData.mpLastWheelWindow = nullptr;
+
// reset marked windows
if ( mpWindowImpl->mpFrameData != nullptr )
{
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 66e89448b798..fce0d799cf79 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1509,26 +1509,27 @@ public:
bool HandleWheelEvent::HandleEvent(const SalWheelMouseEvent& rEvt)
{
static SalWheelMouseEvent aPreviousEvent;
- static VclPtr<vcl::Window> xPreviousWindow;
if (!Setup())
return false;
VclPtr<vcl::Window> xMouseWindow = FindTarget();
+ ImplSVData* pSVData = ImplGetSVData();
+
// avoid the problem that scrolling via wheel to this point brings a widget
// under the mouse that also accepts wheel commands, so stick with the old
// widget if the time gap is very small
- if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) && acceptableWheelScrollTarget(xPreviousWindow))
+ if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) && acceptableWheelScrollTarget(pSVData->maWinData.mpLastWheelWindow))
{
- xMouseWindow = xPreviousWindow.get();
+ xMouseWindow = pSVData->maWinData.mpLastWheelWindow;
}
aPreviousEvent = rEvt;
- xPreviousWindow = Dispatch(xMouseWindow);
+ pSVData->maWinData.mpLastWheelWindow = Dispatch(xMouseWindow);
- return xPreviousWindow;
+ return pSVData->maWinData.mpLastWheelWindow.get();
}
class HandleGestureEvent : public HandleGestureEventBase