Bug 1345355 - Don't register a window as touch-enabled if there's no touch device supported. r=jimm
MozReview-Commit-ID: IycX3e0I5TQ
This commit is contained in:
@@ -56,6 +56,7 @@ user_pref("media.gmp-manager.url.override", "http://%(server)s/dummy-gmp-manager
|
||||
user_pref("media.gmp-manager.updateEnabled", false);
|
||||
user_pref("dom.w3c_touch_events.enabled", 1);
|
||||
user_pref("layout.accessiblecaret.enabled_on_touch", false);
|
||||
user_pref("test.force_register_touch_windows", true);
|
||||
user_pref("dom.webcomponents.enabled", true);
|
||||
user_pref("dom.webcomponents.customelements.enabled", true);
|
||||
user_pref("dom.htmlimports.enabled", true);
|
||||
|
||||
@@ -1704,6 +1704,15 @@ void nsWindow::SetThemeRegion()
|
||||
**************************************************************/
|
||||
|
||||
void nsWindow::RegisterTouchWindow() {
|
||||
if (!WinUtils::IsTouchDeviceSupportPresent() &&
|
||||
!Preferences::GetBool("test.force_register_touch_windows", false)) {
|
||||
// If we don't have any touch support on the device, don't
|
||||
// register any touch windows because it'll consume WM_GESTURE
|
||||
// events from other devices.
|
||||
// For testing purposes we have a pref to override this behaviour
|
||||
// and force the registration of touch windows.
|
||||
return;
|
||||
}
|
||||
mTouchWindow = true;
|
||||
mGesture.RegisterTouchWindow(mWnd);
|
||||
::EnumChildWindows(mWnd, nsWindow::RegisterTouchForDescendants, 0);
|
||||
|
||||
Reference in New Issue
Block a user