diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-21 07:36:42 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-21 07:36:42 +0000 |
| commit | ca2e442d543f3f247d85ff4c8768424f6cbc4257 (patch) | |
| tree | 94383da338a00cc6b407b5f0b84e64a5dd60c9e9 /vcl/source/window/winproc.cxx | |
| parent | 8d6169cf83d2063d4aa6b7399cc97b3037c973f7 (diff) | |
INTEGRATION: CWS late241bf01_DEV300 (1.119.54.2.14); FILE MERGED
2008/05/16 11:06:52 pl 1.119.54.2.14.1: #i85450# shift wheel interpreted as horizontal wheel event
Diffstat (limited to 'vcl/source/window/winproc.cxx')
| -rw-r--r-- | vcl/source/window/winproc.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 9c7b9291dd4d..9bc00430e810 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: winproc.cxx,v $ - * $Revision: 1.124 $ + * $Revision: 1.125 $ * * This file is part of OpenOffice.org. * @@ -1484,14 +1484,20 @@ static long ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv USHORT nMode; USHORT nCode = rEvt.mnCode; + bool bHorz = rEvt.mbHorz; if ( nCode & KEY_MOD1 ) nMode = COMMAND_WHEEL_ZOOM; - else if ( nCode & KEY_SHIFT ) + else if ( nCode & KEY_MOD2 ) nMode = COMMAND_WHEEL_DATAZOOM; else + { nMode = COMMAND_WHEEL_SCROLL; + // #i85450# interpret shift-wheel as horizontal wheel action + if( (nCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3)) == KEY_SHIFT ) + bHorz = true; + } - CommandWheelData aWheelData( rEvt.mnDelta, rEvt.mnNotchDelta, rEvt.mnScrollLines, nMode, nCode, rEvt.mbHorz ); + CommandWheelData aWheelData( rEvt.mnDelta, rEvt.mnNotchDelta, rEvt.mnScrollLines, nMode, nCode, bHorz ); Point aMousePos( rEvt.mnX, rEvt.mnY ); BOOL bRet = TRUE; |