OLD | NEW |
1 /* | 1 /* |
2 Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) | 2 Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) |
3 | 3 |
4 This library is free software; you can redistribute it and/or | 4 This library is free software; you can redistribute it and/or |
5 modify it under the terms of the GNU Library General Public | 5 modify it under the terms of the GNU Library General Public |
6 License as published by the Free Software Foundation; either | 6 License as published by the Free Software Foundation; either |
7 version 2 of the License, or (at your option) any later version. | 7 version 2 of the License, or (at your option) any later version. |
8 | 8 |
9 This library is distributed in the hope that it will be useful, | 9 This library is distributed in the hope that it will be useful, |
10 but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 21 matching lines...) Expand all Loading... |
32 TouchMoved, | 32 TouchMoved, |
33 TouchStationary, | 33 TouchStationary, |
34 TouchCancelled, | 34 TouchCancelled, |
35 TouchStateEnd // Placeholder: must remain the last item. | 35 TouchStateEnd // Placeholder: must remain the last item. |
36 }; | 36 }; |
37 | 37 |
38 // This is necessary for us to be able to build synthetic events. | 38 // This is necessary for us to be able to build synthetic events. |
39 PlatformTouchPoint() | 39 PlatformTouchPoint() |
40 : m_id(0) | 40 : m_id(0) |
41 , m_rotationAngle(0) | 41 , m_rotationAngle(0) |
| 42 , m_tilt(0) |
42 , m_force(0) | 43 , m_force(0) |
43 { | 44 { |
44 } | 45 } |
45 | 46 |
46 unsigned id() const { return m_id; } | 47 unsigned id() const { return m_id; } |
47 State state() const { return m_state; } | 48 State state() const { return m_state; } |
48 FloatPoint screenPos() const { return m_screenPos; } | 49 FloatPoint screenPos() const { return m_screenPos; } |
49 FloatPoint pos() const { return m_pos; } | 50 FloatPoint pos() const { return m_pos; } |
50 FloatSize radius() const { return m_radius; } | 51 FloatSize radius() const { return m_radius; } |
51 float rotationAngle() const { return m_rotationAngle; } | 52 float rotationAngle() const { return m_rotationAngle; } |
| 53 float tilt() const { return m_tilt; } |
52 float force() const { return m_force; } | 54 float force() const { return m_force; } |
53 | 55 |
54 protected: | 56 protected: |
55 unsigned m_id; | 57 unsigned m_id; |
56 State m_state; | 58 State m_state; |
57 FloatPoint m_screenPos; | 59 FloatPoint m_screenPos; |
58 FloatPoint m_pos; | 60 FloatPoint m_pos; |
59 FloatSize m_radius; | 61 FloatSize m_radius; |
60 float m_rotationAngle; | 62 float m_rotationAngle; |
| 63 float m_tilt; |
61 float m_force; | 64 float m_force; |
62 }; | 65 }; |
63 | 66 |
64 } | 67 } |
65 | 68 |
66 #endif // PlatformTouchPoint_h | 69 #endif // PlatformTouchPoint_h |
OLD | NEW |