callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

W32: Support horizontal mouse wheel scrolling

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=748014
(cherry picked from commit c0e0a1508be3ccf349717497af2e8a4d77027649)
This commit is contained in:
Руслан Ижбулатов
2015-04-16 23:11:14 +00:00
committed by Jehan
parent 3da748930f
commit 92fb170917
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/win32/gdkevents-win32.c
View File

@ -2663,6 +2663,7 @@ gdk_event_translate (MSG *msg,
break; break;
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
case WM_MOUSEHWHEEL:
GDK_NOTE (EVENTS, g_print (" %d", (short) HIWORD (msg->wParam))); GDK_NOTE (EVENTS, g_print (" %d", (short) HIWORD (msg->wParam)));
/* WM_MOUSEWHEEL is delivered to the focus window. Work around /* WM_MOUSEWHEEL is delivered to the focus window. Work around
@ -2713,8 +2714,13 @@ gdk_event_translate (MSG *msg,
event = gdk_event_new (GDK_SCROLL); event = gdk_event_new (GDK_SCROLL);
event->scroll.window = window; event->scroll.window = window;
event->scroll.direction = (((short) HIWORD (msg->wParam)) > 0) ?
GDK_SCROLL_UP : GDK_SCROLL_DOWN; if (msg->message == WM_MOUSEWHEEL)
event->scroll.direction = (((short) HIWORD (msg->wParam)) > 0) ?
GDK_SCROLL_UP : GDK_SCROLL_DOWN;
else if (msg->message == WM_MOUSEHWHEEL)
event->scroll.direction = (((short) HIWORD (msg->wParam)) > 0) ?
GDK_SCROLL_RIGHT : GDK_SCROLL_LEFT;
event->scroll.time = _gdk_win32_get_next_tick (msg->time); event->scroll.time = _gdk_win32_get_next_tick (msg->time);
event->scroll.x = (gint16) point.x; event->scroll.x = (gint16) point.x;
event->scroll.y = (gint16) point.y; event->scroll.y = (gint16) point.y;

1
gdk/win32/gdkmain-win32.c
View File

@ -980,6 +980,7 @@ _gdk_win32_message_to_string (UINT msg)
CASE (WM_MBUTTONUP); CASE (WM_MBUTTONUP);
CASE (WM_MBUTTONDBLCLK); CASE (WM_MBUTTONDBLCLK);
CASE (WM_MOUSEWHEEL); CASE (WM_MOUSEWHEEL);
CASE (WM_MOUSEHWHEEL);
CASE (WM_XBUTTONDOWN); CASE (WM_XBUTTONDOWN);
CASE (WM_XBUTTONUP); CASE (WM_XBUTTONUP);
CASE (WM_XBUTTONDBLCLK); CASE (WM_XBUTTONDBLCLK);

3
gdk/win32/gdkprivate-win32.h
View File

@ -92,6 +92,9 @@
#ifndef WM_APPCOMMAND #ifndef WM_APPCOMMAND
#define WM_APPCOMMAND 0x319 #define WM_APPCOMMAND 0x319
#endif #endif
#ifndef WM_MOUSEHWHEEL
#define WM_MOUSEHWHEEL 0x20E
#endif
#ifndef CF_DIBV5 #ifndef CF_DIBV5
#define CF_DIBV5 17 #define CF_DIBV5 17