wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1163056 - InkCollector activation at first PEN event. r=jimm

Browse Source
This commit is contained in:
Maksim Lebedev 2015-05-13 05:46:00 -04:00
parent 1e81219f05
commit 18d585d49f
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
widget/windows/nsWindow.cpp
View File

@ -3772,7 +3772,7 @@ bool nsWindow::DispatchMouseEvent(uint32_t aEventType, WPARAM wParam,
return result;
}
if (WinUtils::GetIsMouseFromTouch(aEventType) && mTouchWindow) {
if (mTouchWindow && WinUtils::GetIsMouseFromTouch(aEventType)) {
// If mTouchWindow is true, then we must have APZ enabled and be
// feeding it raw touch events. In that case we don't need to
// send touch-generated mouse events to content.
@ -3780,17 +3780,13 @@ bool nsWindow::DispatchMouseEvent(uint32_t aEventType, WPARAM wParam,
return result;
}
// Checking for NS_MOUSE_MOVE prevents a largest waterfall of unused initializations.
if (NS_MOUSE_MOVE != aEventType
// Since it is unclear whether a user will use the digitizer,
// Postpone initialization until first PEN message will be found.
&& nsIDOMMouseEvent::MOZ_SOURCE_PEN == aInputSource
// Since it is unclear whether a user will use the digitizer,
// Postpone initialization until first PEN message will be found.
if (nsIDOMMouseEvent::MOZ_SOURCE_PEN == aInputSource
// Messages should be only at topLevel window.
&& nsWindowType::eWindowType_toplevel == mWindowType
// Currently this scheme is used only when pointer events is enabled.
&& gfxPrefs::PointerEventsEnabled()
// NS_MOUSE_EXIT_WIDGET is received, when InkCollector has been already initialized.
&& NS_MOUSE_EXIT_WIDGET != aEventType) {
&& gfxPrefs::PointerEventsEnabled()) {
InkCollector::sInkCollector->SetTarget(mWnd);
}