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

Unified Diff: ui/views/controls/menu/menu_controller.cc

Issue 341763002: Ensure that mouse events on Windows reposted by the menu_controller are converted to pixel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review comments Created 6 years, 6 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 | « ui/gfx/screen_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_controller.cc
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 38a5e81e8e7e1a84406f23801e670a20771596bb..ff98810da30e1f826deeb1f29c703d0c94d2ffad 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -39,6 +39,7 @@
#if defined(OS_WIN)
#include "ui/base/win/internal_constants.h"
+#include "ui/gfx/win/dpi.h"
#include "ui/views/win/hwnd_util.h"
#endif
@@ -2051,12 +2052,16 @@ void MenuController::RepostEvent(SubmenuView* source,
gfx::NativeWindow window = screen->GetWindowAtScreenPoint(screen_loc);
#if defined(OS_WIN)
+ // Convert screen_loc to pixels for the Win32 API's like WindowFromPoint,
+ // PostMessage/SendMessage to work correctly. These API's expect the
+ // coordinates to be in pixels.
+ gfx::Point screen_loc_pixels = gfx::win::DIPToScreenPoint(screen_loc);
sky 2014/06/19 15:33:32 nit: move into conditional block below, it's only
ananta 2014/06/19 18:45:26 Done.
// PostMessage() to metro windows isn't allowed (access will be denied). Don't
// try to repost with Win32 if the window under the mouse press is in metro.
if (!ViewsDelegate::views_delegate ||
!ViewsDelegate::views_delegate->IsWindowInMetro(window)) {
HWND target_window = window ? HWNDForNativeWindow(window) :
- WindowFromPoint(screen_loc.ToPOINT());
+ WindowFromPoint(screen_loc_pixels.ToPOINT());
HWND source_window = HWNDForNativeView(native_view);
if (!target_window || !source_window ||
GetWindowThreadProcessId(source_window, NULL) !=
@@ -2070,7 +2075,7 @@ void MenuController::RepostEvent(SubmenuView* source,
// Determine whether the click was in the client area or not.
// NOTE: WM_NCHITTEST coordinates are relative to the screen.
- LPARAM coords = MAKELPARAM(screen_loc.x(), screen_loc.y());
+ LPARAM coords = MAKELPARAM(screen_loc_pixels.x(), screen_loc_pixels.y());
LRESULT nc_hit_result = SendMessage(target_window, WM_NCHITTEST, 0, coords);
const bool client_area = nc_hit_result == HTCLIENT;
@@ -2090,8 +2095,8 @@ void MenuController::RepostEvent(SubmenuView* source,
return;
}
- int window_x = screen_loc.x();
- int window_y = screen_loc.y();
+ int window_x = screen_loc_pixels.x();
+ int window_y = screen_loc_pixels.y();
if (client_area) {
POINT pt = { window_x, window_y };
ScreenToClient(target_window, &pt);
« no previous file with comments | « ui/gfx/screen_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698