From 6d8d4b309844a98caefa830303818d177605dc4c Mon Sep 17 00:00:00 2001 From: "U-SLAVA-DFB8FF805\\Slava" Date: Mon, 1 Dec 2008 18:20:19 -0600 Subject: [PATCH] Fix odd Windows mouse wheel behavior --- basis/ui/windows/windows.factor | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/basis/ui/windows/windows.factor b/basis/ui/windows/windows.factor index 1d3212c436..1481287e95 100755 --- a/basis/ui/windows/windows.factor +++ b/basis/ui/windows/windows.factor @@ -285,12 +285,8 @@ SYMBOL: nc-buttons swap [ push ] [ delete ] if ; : >lo-hi ( WORD -- array ) [ lo-word ] [ hi-word ] bi 2array ; -: mouse-wheel ( wParam -- array ) >lo-hi [ sgn neg ] map ; -: mouse-absolute>relative ( lparam handle -- array ) - [ >lo-hi ] dip - "RECT" [ GetWindowRect win32-error=0/f ] keep - get-RECT-top-left 2array v- ; +: mouse-wheel ( wParam -- array ) >lo-hi [ sgn neg ] map ; : mouse-event>gesture ( uMsg -- button ) key-modifiers swap message>button @@ -340,9 +336,7 @@ SYMBOL: nc-buttons >lo-hi swap window move-hand fire-motion ; :: handle-wm-mousewheel ( hWnd uMsg wParam lParam -- ) - wParam mouse-wheel - lParam hWnd mouse-absolute>relative - hWnd window send-wheel ; + wParam mouse-wheel hand-loc get hWnd window send-wheel ; : handle-wm-cancelmode ( hWnd uMsg wParam lParam -- ) #! message sent if windows needs application to stop dragging