Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1189)

Unified Diff: ui/events/platform/x11/x11_hotplug_event_handler.cc

Issue 914393002: Make the Automatic detection of "Enable touch events" work in Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/platform/x11/x11_hotplug_event_handler.cc
diff --git a/ui/events/platform/x11/x11_hotplug_event_handler.cc b/ui/events/platform/x11/x11_hotplug_event_handler.cc
index 5efe25d422b33d0fe379284a7edb14e2c561bd6b..ddd3aec61733f06b6cb41f4cd717fd40e937048c 100644
--- a/ui/events/platform/x11/x11_hotplug_event_handler.cc
+++ b/ui/events/platform/x11/x11_hotplug_event_handler.cc
@@ -245,8 +245,9 @@ void HandleTouchscreenDevicesInWorker(
std::set<int> no_match_touchscreen;
for (const DeviceInfo& device_info : device_infos) {
- if (!device_info.enabled || device_info.use != XIFloatingSlave)
- continue; // Assume all touchscreens are floating slaves
+ if (!device_info.enabled || (device_info.use != XIFloatingSlave
+ && device_info.use != XISlavePointer))
+ continue;
double max_x = -1.0;
double max_y = -1.0;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698