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

Unified Diff: ash/host/ash_window_tree_host_ozone.cc

Issue 657603002: ash: ozone: apply transformation to events outside the root window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: coding style Created 6 years, 2 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 | ash/wm/drag_window_resizer.cc » ('j') | ui/aura/window_tree_host_ozone.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host_ozone.cc
diff --git a/ash/host/ash_window_tree_host_ozone.cc b/ash/host/ash_window_tree_host_ozone.cc
index 6b24015d06442d2060690eb0bd319db39b282f9f..7b0dd1d240bae208db66156acebb5fa5d852f828 100644
--- a/ash/host/ash_window_tree_host_ozone.cc
+++ b/ash/host/ash_window_tree_host_ozone.cc
@@ -8,6 +8,7 @@
#include "ash/host/root_window_transformer.h"
#include "ash/host/transformer_helper.h"
#include "base/command_line.h"
+#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/window_tree_host_ozone.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/transform.h"
@@ -21,6 +22,9 @@ class AshWindowTreeHostOzone : public AshWindowTreeHost,
explicit AshWindowTreeHostOzone(const gfx::Rect& initial_bounds);
virtual ~AshWindowTreeHostOzone();
+ protected:
+ void TranslateLocatedEvent(ui::LocatedEvent* event) OVERRIDE;
+
private:
// AshWindowTreeHost:
virtual void ToggleFullScreen() OVERRIDE;
@@ -87,6 +91,30 @@ void AshWindowTreeHostOzone::UpdateRootWindowSize(const gfx::Size& host_size) {
transformer_helper_.UpdateWindowSize(host_size);
}
+void AshWindowTreeHostOzone::TranslateLocatedEvent(ui::LocatedEvent* event) {
+ if (!event->IsTouchEvent()) {
+ aura::Window* root_window = window();
+ aura::client::ScreenPositionClient* screen_position_client =
+ aura::client::GetScreenPositionClient(root_window);
+ gfx::Rect local(bounds().size());
+
+ local.Inset(transformer_helper_.GetHostInsets());
+
+ if (screen_position_client && !local.Contains(event->location())) {
+ gfx::Point location(event->location());
+ // In order to get the correct point in screen coordinates
+ // during passive grab, we first need to find on which host window
+ // the mouse is on, and find out the screen coordinates on that
+ // host window, then convert it back to this host window's coordinate.
+ screen_position_client->ConvertHostPointToScreen(root_window, &location);
+ screen_position_client->ConvertPointFromScreen(root_window, &location);
+ ConvertPointToHost(&location);
+ event->set_location(location);
+ event->set_root_location(location);
+ }
+ }
+}
+
} // namespace
AshWindowTreeHost* AshWindowTreeHost::Create(
« no previous file with comments | « no previous file | ash/wm/drag_window_resizer.cc » ('j') | ui/aura/window_tree_host_ozone.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698