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

Unified Diff: ash/display/screen_ash.cc

Issue 2715513006: Fix showing the sibling menu on mouse move (Closed)
Patch Set: Fix compile error Created 3 years, 9 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/drag_drop/drag_drop_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_ash.cc
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
index c6a2847c2cdbacd4d500bedb751f39930272beec..a248668ad84f7f007ca2c132bc8f0fc34fcf2db7 100644
--- a/ash/display/screen_ash.cc
+++ b/ash/display/screen_ash.cc
@@ -90,8 +90,8 @@ gfx::Point ScreenAsh::GetCursorScreenPoint() {
}
bool ScreenAsh::IsWindowUnderCursor(gfx::NativeWindow window) {
- return GetWindowAtScreenPoint(
- display::Screen::GetScreen()->GetCursorScreenPoint()) == window;
+ return window->Contains(GetWindowAtScreenPoint(
+ display::Screen::GetScreen()->GetCursorScreenPoint()));
}
gfx::NativeWindow ScreenAsh::GetWindowAtScreenPoint(const gfx::Point& point) {
@@ -104,7 +104,7 @@ gfx::NativeWindow ScreenAsh::GetWindowAtScreenPoint(const gfx::Point& point) {
if (position_client)
position_client->ConvertPointFromScreen(root_window, &local_point);
- return root_window->GetTopWindowContainingPoint(local_point);
+ return root_window->GetEventHandlerForPoint(local_point);
}
int ScreenAsh::GetNumDisplays() const {
« no previous file with comments | « no previous file | ash/drag_drop/drag_drop_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698