OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006 Apple Computer, Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #import "config.h" | 26 #import "config.h" |
27 #import "PlatformWheelEvent.h" | 27 #import "PlatformWheelEvent.h" |
28 | 28 |
29 #import "PlatformMouseEvent.h" | 29 #import "PlatformMouseEvent.h" |
| 30 #import "Scrollbar.h" |
30 #import "WebCoreSystemInterface.h" | 31 #import "WebCoreSystemInterface.h" |
31 | 32 |
32 namespace WebCore { | 33 namespace WebCore { |
33 | 34 |
34 PlatformWheelEvent::PlatformWheelEvent(NSEvent* event) | 35 PlatformWheelEvent::PlatformWheelEvent(NSEvent* event) |
35 : m_position(pointForEvent(event)) | 36 : m_position(pointForEvent(event)) |
36 , m_globalPosition(globalPointForEvent(event)) | 37 , m_globalPosition(globalPointForEvent(event)) |
| 38 , m_granularity(ScrollByPixelWheelEvent) |
37 , m_isAccepted(false) | 39 , m_isAccepted(false) |
38 , m_shiftKey([event modifierFlags] & NSShiftKeyMask) | 40 , m_shiftKey([event modifierFlags] & NSShiftKeyMask) |
39 , m_ctrlKey([event modifierFlags] & NSControlKeyMask) | 41 , m_ctrlKey([event modifierFlags] & NSControlKeyMask) |
40 , m_altKey([event modifierFlags] & NSAlternateKeyMask) | 42 , m_altKey([event modifierFlags] & NSAlternateKeyMask) |
41 , m_metaKey([event modifierFlags] & NSCommandKeyMask) | 43 , m_metaKey([event modifierFlags] & NSCommandKeyMask) |
42 { | 44 { |
43 BOOL continuous; | 45 BOOL continuous; |
44 wkGetWheelEventDeltas(event, &m_deltaX, &m_deltaY, &continuous); | 46 wkGetWheelEventDeltas(event, &m_deltaX, &m_deltaY, &continuous); |
45 m_granularity = continuous ? ScrollByPixelWheelEvent : ScrollByLineWheelEven
t; | 47 if (!continuous) { |
46 if (m_granularity == ScrollByLineWheelEvent) { | 48 m_deltaX *= (float)cScrollbarPixelsPerLineStep; |
47 m_deltaX *= horizontalLineMultiplier(); | 49 m_deltaY *= (float)cScrollbarPixelsPerLineStep; |
48 m_deltaY *= verticalLineMultiplier(); | |
49 } | 50 } |
50 } | 51 } |
51 | 52 |
52 } // namespace WebCore | 53 } // namespace WebCore |
OLD | NEW |