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

Unified Diff: ui/aura/root_window.cc

Issue 13947045: Magnifier: Move the cursor directly to the root window host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comments Created 7 years, 8 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
Index: ui/aura/root_window.cc
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 968a25ce6edd18ff3a3bcac12f54f85e287bc8aa..1d7965f3703f8fe80c27401aeac78e3db83699e0 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -289,9 +289,9 @@ void RootWindow::OnMouseEventsEnableStateChanged(bool enabled) {
}
void RootWindow::MoveCursorTo(const gfx::Point& location_in_dip) {
- gfx::Point3F point_3f(location_in_dip);
- GetRootTransform().TransformPoint(point_3f);
- host_->MoveCursorTo(gfx::ToFlooredPoint(point_3f.AsPointF()));
+ gfx::Point location(location_in_dip);
+ ConvertPointToHost(&location);
+ host_->MoveCursorTo(location);
SetLastMouseLocation(this, location_in_dip);
client::CursorClient* cursor_client = client::GetCursorClient(this);
if (cursor_client) {
@@ -301,6 +301,21 @@ void RootWindow::MoveCursorTo(const gfx::Point& location_in_dip) {
}
}
+void RootWindow::MoveCursorToHostLoation(const gfx::Point& host_location) {
+ host_->MoveCursorTo(host_location);
+ gfx::Point root_location(host_location);
+ ConvertPointFromHost(&root_location);
+ SetLastMouseLocation(this, root_location);
+ client::CursorClient* cursor_client = client::GetCursorClient(this);
+ if (cursor_client) {
+ const gfx::Display& display =
+ gfx::Screen::GetScreenFor(this)->GetDisplayNearestWindow(this);
+ cursor_client->SetDisplay(display);
+ }
+
+ synthesize_mouse_move_ = false;
+}
+
bool RootWindow::ConfineCursorToWindow() {
// We would like to be able to confine the cursor to that window. However,
// currently, we do not have such functionality in X. So we just confine
« ash/magnifier/magnification_controller_unittest.cc ('K') | « ui/aura/root_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698