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

Unified Diff: ui/views/widget/native_widget_win.cc

Issue 16950030: Handle alternate types in HandleMouseEvent. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Move virtual override to end of class/public. Created 7 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/base/events/event.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_win.cc
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index 2123600168a169c4d30f013f019e2a742a678971..dbeb132de6ee92b75ec03af821835cd3a3566830 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -743,11 +743,25 @@ void NativeWidgetWin::HandleNativeBlur(HWND focused_window) {
}
bool NativeWidgetWin::HandleMouseEvent(const ui::MouseEvent& event) {
- ui::MouseEvent dpi_event(event);
- dpi_event.set_location(ui::win::ScreenToDIPPoint(event.location()));
- dpi_event.set_root_location(ui::win::ScreenToDIPPoint(event.location()));
- delegate_->OnMouseEvent(&dpi_event);
- return dpi_event.handled();
+ static gfx::Transform scale_transform(
+ 1/ui::win::GetDeviceScaleFactor(), 0.0,
+ 0.0, 1/ui::win::GetDeviceScaleFactor(),
+ 0.0, 0.0);
+ if (event.IsMouseWheelEvent()) {
+ ui::MouseWheelEvent dpi_event(
+ static_cast<const ui::MouseWheelEvent&>(event));
+ dpi_event.UpdateForRootTransform(scale_transform);
+ delegate_->OnMouseEvent(&dpi_event);
+ return dpi_event.handled();
+ } else if (event.IsMouseEvent()) {
+ CHECK(!event.IsScrollEvent()); // Scroll events don't happen in Windows.
+ ui::MouseEvent dpi_event(event);
+ dpi_event.UpdateForRootTransform(scale_transform);
+ delegate_->OnMouseEvent(&dpi_event);
+ return dpi_event.handled();
+ }
+ NOTREACHED();
+ return false;
}
bool NativeWidgetWin::HandleKeyEvent(const ui::KeyEvent& event) {
« no previous file with comments | « ui/base/events/event.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698