| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/events/ozone/evdev/tablet_event_converter_evdev.h" | 5 #include "ui/events/ozone/evdev/tablet_event_converter_evdev.h" |
| 6 | 6 |
| 7 #include <errno.h> | 7 #include <errno.h> |
| 8 #include <linux/input.h> | 8 #include <linux/input.h> |
| 9 | 9 |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 abs_value_dirty_ = true; | 103 abs_value_dirty_ = true; |
| 104 break; | 104 break; |
| 105 case ABS_Y: | 105 case ABS_Y: |
| 106 y_abs_location_ = input.value; | 106 y_abs_location_ = input.value; |
| 107 abs_value_dirty_ = true; | 107 abs_value_dirty_ = true; |
| 108 break; | 108 break; |
| 109 } | 109 } |
| 110 } | 110 } |
| 111 | 111 |
| 112 void TabletEventConverterEvdev::UpdateCursor() { | 112 void TabletEventConverterEvdev::UpdateCursor() { |
| 113 gfx::Rect display_bounds = cursor_->GetCursorDisplayBounds(); | 113 gfx::Rect display_bounds = cursor_->GetCursorConfinedBounds(); |
| 114 | 114 |
| 115 int x = | 115 int x = |
| 116 ((x_abs_location_ - x_abs_min_) * display_bounds.width()) / x_abs_range_; | 116 ((x_abs_location_ - x_abs_min_) * display_bounds.width()) / x_abs_range_; |
| 117 int y = | 117 int y = |
| 118 ((y_abs_location_ - y_abs_min_) * display_bounds.height()) / y_abs_range_; | 118 ((y_abs_location_ - y_abs_min_) * display_bounds.height()) / y_abs_range_; |
| 119 | 119 |
| 120 x += display_bounds.x(); | 120 x += display_bounds.x(); |
| 121 y += display_bounds.y(); | 121 y += display_bounds.y(); |
| 122 | 122 |
| 123 cursor_->MoveCursorTo(gfx::PointF(x, y)); | 123 cursor_->MoveCursorTo(gfx::PointF(x, y)); |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 | 168 |
| 169 callback_.Run(make_scoped_ptr( | 169 callback_.Run(make_scoped_ptr( |
| 170 new MouseEvent(ui::ET_MOUSE_MOVED, cursor_->GetLocation(), | 170 new MouseEvent(ui::ET_MOUSE_MOVED, cursor_->GetLocation(), |
| 171 cursor_->GetLocation(), modifiers_->GetModifierFlags(), | 171 cursor_->GetLocation(), modifiers_->GetModifierFlags(), |
| 172 /* changed_button_flags */ 0))); | 172 /* changed_button_flags */ 0))); |
| 173 | 173 |
| 174 abs_value_dirty_ = false; | 174 abs_value_dirty_ = false; |
| 175 } | 175 } |
| 176 | 176 |
| 177 } // namespace ui | 177 } // namespace ui |
| OLD | NEW |