Index: ui/aura/mus/window_tree_client.cc |
diff --git a/ui/aura/mus/window_tree_client.cc b/ui/aura/mus/window_tree_client.cc |
index b71391bc5bab8f5977235c55f7e570fe3f791b1c..42930fceb4ec2f075027591ad23854d43628badd 100644 |
--- a/ui/aura/mus/window_tree_client.cc |
+++ b/ui/aura/mus/window_tree_client.cc |
@@ -42,6 +42,7 @@ |
#include "ui/aura/mus/window_tree_host_mus.h" |
#include "ui/aura/window.h" |
#include "ui/aura/window_delegate.h" |
+#include "ui/aura/window_event_dispatcher.h" |
#include "ui/aura/window_tracker.h" |
#include "ui/base/ui_base_types.h" |
#include "ui/display/display.h" |
@@ -1152,10 +1153,13 @@ void WindowTreeClient::OnWindowInputEvent(uint32_t event_id, |
// The location of the event is relative to |window|. As the event is handed |
// to WindowTreeHost we need it to be relative to WindowTreeHost. |
if (event->IsLocatedEvent()) { |
- gfx::Point host_location = event->AsLocatedEvent()->location(); |
+ gfx::Point host_location_in_pixels = event->AsLocatedEvent()->location(); |
+ gfx::Point host_location_in_dip = gfx::ConvertPointToDIP( |
+ ScaleFactorForDisplay(window->GetWindow()), host_location_in_pixels); |
aura::Window::ConvertPointToTarget(window->GetWindow(), host->window(), |
- &host_location); |
- event->AsLocatedEvent()->set_location(host_location); |
+ &host_location_in_dip); |
+ event->AsLocatedEvent()->set_location(host_location_in_dip); |
+ window->GetWindow()->GetHost()->dispatcher()->set_transform_events(false); |
} |
EventAckHandler ack_handler(CreateEventResultCallback(event_id)); |