| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/base/gestures/gesture_types.h" | 5 #include "ui/base/gestures/gesture_types.h" |
| 6 | 6 |
| 7 namespace ui { | 7 namespace ui { |
| 8 | 8 |
| 9 GestureEventDetails::GestureEventDetails(ui::EventType type, | 9 GestureEventDetails::GestureEventDetails(ui::EventType type, |
| 10 float delta_x, | 10 float delta_x, |
| 11 float delta_y) | 11 float delta_y) |
| 12 : type_(type), | 12 : type_(type), |
| 13 touch_points_(1) { | 13 touch_points_(1) { |
| 14 switch (type_) { | 14 switch (type_) { |
| 15 case ui::ET_GESTURE_SCROLL_UPDATE: | 15 case ui::ET_GESTURE_SCROLL_UPDATE: |
| 16 data.scroll.x = delta_x; | 16 data.scroll_update.x = delta_x; |
| 17 data.scroll.y = delta_y; | 17 data.scroll_update.y = delta_y; |
| 18 break; | 18 break; |
| 19 | 19 |
| 20 case ui::ET_SCROLL_FLING_START: | 20 case ui::ET_SCROLL_FLING_START: |
| 21 data.velocity.x = delta_x; | 21 data.fling_velocity.x = delta_x; |
| 22 data.velocity.y = delta_y; | 22 data.fling_velocity.y = delta_y; |
| 23 break; | 23 break; |
| 24 | 24 |
| 25 case ui::ET_GESTURE_LONG_PRESS: | 25 case ui::ET_GESTURE_LONG_PRESS: |
| 26 data.touch_id = static_cast<int>(delta_x); | 26 data.touch_id = static_cast<int>(delta_x); |
| 27 CHECK_EQ(0.f, delta_y) << "Unknown data in delta_y for long press."; | 27 CHECK_EQ(0.f, delta_y) << "Unknown data in delta_y for long press."; |
| 28 break; | 28 break; |
| 29 | 29 |
| 30 case ui::ET_GESTURE_PINCH_UPDATE: | 30 case ui::ET_GESTURE_PINCH_UPDATE: |
| 31 data.scale = delta_x; | 31 data.scale = delta_x; |
| 32 CHECK_EQ(0.f, delta_y) << "Unknown data in delta_y for pinch"; | 32 CHECK_EQ(0.f, delta_y) << "Unknown data in delta_y for pinch"; |
| 33 break; | 33 break; |
| 34 | 34 |
| 35 case ui::ET_GESTURE_MULTIFINGER_SWIPE: | 35 case ui::ET_GESTURE_MULTIFINGER_SWIPE: |
| 36 data.swipe.left = delta_x < 0; | 36 data.swipe.left = delta_x < 0; |
| 37 data.swipe.right = delta_x > 0; | 37 data.swipe.right = delta_x > 0; |
| 38 data.swipe.up = delta_y < 0; | 38 data.swipe.up = delta_y < 0; |
| 39 data.swipe.down = delta_y > 0; | 39 data.swipe.down = delta_y > 0; |
| 40 break; | 40 break; |
| 41 | 41 |
| 42 case ui::ET_GESTURE_TAP: | 42 case ui::ET_GESTURE_TAP: |
| 43 data.tap_count = static_cast<int>(delta_x); | 43 data.tap_count = static_cast<int>(delta_x); |
| 44 CHECK_EQ(0.f, delta_y) << "Unknown data in delta_y for tap."; | 44 CHECK_EQ(0.f, delta_y) << "Unknown data in delta_y for tap."; |
| 45 break; | 45 break; |
| 46 | 46 |
| 47 default: | 47 default: |
| 48 data.generic.delta_x = delta_x; | |
| 49 data.generic.delta_y = delta_y; | |
| 50 if (delta_x != 0.f || delta_y != 0.f) { | 48 if (delta_x != 0.f || delta_y != 0.f) { |
| 51 DLOG(WARNING) << "A gesture event (" << type << ") had unknown data: (" | 49 DLOG(WARNING) << "A gesture event (" << type << ") had unknown data: (" |
| 52 << delta_x << "," << delta_y; | 50 << delta_x << "," << delta_y; |
| 53 } | 51 } |
| 54 break; | 52 break; |
| 55 } | 53 } |
| 56 } | 54 } |
| 57 | 55 |
| 56 void GestureEventDetails::SetScrollVelocity(float velocity_x, |
| 57 float velocity_y) { |
| 58 CHECK_EQ(ui::ET_GESTURE_SCROLL_UPDATE, type_); |
| 59 data.scroll_update.velocity_x = velocity_x; |
| 60 data.scroll_update.velocity_y = velocity_y; |
| 61 } |
| 62 |
| 58 } // namespace ui | 63 } // namespace ui |
| OLD | NEW |