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

Unified Diff: ui/views/win/hwnd_message_handler.h

Issue 133053004: Ensure that trackpad and trackpoint scrolling works on Windows desktop Aura with legacy trackpad dr… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 11 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/views/widget/native_widget_win.cc ('k') | ui/views/win/hwnd_message_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/win/hwnd_message_handler.h
===================================================================
--- ui/views/win/hwnd_message_handler.h (revision 244237)
+++ ui/views/win/hwnd_message_handler.h (working copy)
@@ -324,6 +324,10 @@
MESSAGE_HANDLER_EX(WM_DEADCHAR, OnImeMessages)
MESSAGE_HANDLER_EX(WM_SYSDEADCHAR, OnImeMessages)
+ // Scroll events
+ MESSAGE_HANDLER_EX(WM_VSCROLL, OnScrollMessage)
+ MESSAGE_HANDLER_EX(WM_HSCROLL, OnScrollMessage)
+
// Touch Events.
MESSAGE_HANDLER_EX(WM_TOUCH, OnTouchEvent)
@@ -410,6 +414,7 @@
LRESULT OnNotify(int w_param, NMHDR* l_param);
void OnPaint(HDC dc);
LRESULT OnReflectedMessage(UINT message, WPARAM w_param, LPARAM l_param);
+ LRESULT OnScrollMessage(UINT message, WPARAM w_param, LPARAM l_param);
LRESULT OnSetCursor(UINT message, WPARAM w_param, LPARAM l_param);
void OnSetFocus(HWND last_focused_window);
LRESULT OnSetIcon(UINT size_type, HICON new_icon);
@@ -534,6 +539,9 @@
// Generates touch-ids for touch-events.
ui::SequentialIDGenerator id_generator_;
+ // Indicates if the window has the WS_VSCROLL and WS_HSCROLL styles set.
+ bool scroll_styles_set_;
+
DISALLOW_COPY_AND_ASSIGN(HWNDMessageHandler);
};
« no previous file with comments | « ui/views/widget/native_widget_win.cc ('k') | ui/views/win/hwnd_message_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698