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/views/view_targeter.h" | 5 #include "ui/views/view_targeter.h" |
6 | 6 |
7 #include "ui/events/event_target.h" | 7 #include "ui/events/event_target.h" |
8 #include "ui/views/focus/focus_manager.h" | 8 #include "ui/views/focus/focus_manager.h" |
9 #include "ui/views/view.h" | 9 #include "ui/views/view.h" |
10 | 10 |
11 namespace views { | 11 namespace views { |
12 | 12 |
13 ViewTargeter::ViewTargeter() {} | 13 ViewTargeter::ViewTargeter() {} |
14 ViewTargeter::~ViewTargeter() {} | 14 ViewTargeter::~ViewTargeter() {} |
15 | 15 |
16 gfx::RectF ViewTargeter::BoundsForEvent(const ui::LocatedEvent& event) const { | |
17 gfx::RectF event_bounds(event.location(), gfx::Size(1, 1)); | |
sadrul
2014/05/27 16:26:18
Another quick nit: event.location_f() and gfx::Siz
tdanderson
2014/05/27 16:30:08
Oops, sorry, forgot to change accordingly. Done.
| |
18 if (event.IsGestureEvent()) { | |
19 const ui::GestureEvent& gesture = | |
20 static_cast<const ui::GestureEvent&>(event); | |
21 event_bounds = gesture.details().bounding_box_f(); | |
22 } | |
23 | |
24 return event_bounds; | |
25 } | |
26 | |
16 ui::EventTarget* ViewTargeter::FindTargetForEvent(ui::EventTarget* root, | 27 ui::EventTarget* ViewTargeter::FindTargetForEvent(ui::EventTarget* root, |
17 ui::Event* event) { | 28 ui::Event* event) { |
18 View* view = static_cast<View*>(root); | 29 View* view = static_cast<View*>(root); |
19 if (event->IsKeyEvent()) | 30 if (event->IsKeyEvent()) |
20 return FindTargetForKeyEvent(view, *static_cast<ui::KeyEvent*>(event)); | 31 return FindTargetForKeyEvent(view, *static_cast<ui::KeyEvent*>(event)); |
21 else if (event->IsScrollEvent()) | 32 else if (event->IsScrollEvent()) |
22 return EventTargeter::FindTargetForEvent(root, event); | 33 return EventTargeter::FindTargetForEvent(root, event); |
23 | 34 |
24 NOTREACHED() << "ViewTargeter does not yet support this event type."; | 35 NOTREACHED() << "ViewTargeter does not yet support this event type."; |
25 return NULL; | 36 return NULL; |
(...skipping 29 matching lines...) Expand all Loading... | |
55 return view->HitTestRect(rect_in_view_coords); | 66 return view->HitTestRect(rect_in_view_coords); |
56 } | 67 } |
57 | 68 |
58 View* ViewTargeter::FindTargetForKeyEvent(View* view, const ui::KeyEvent& key) { | 69 View* ViewTargeter::FindTargetForKeyEvent(View* view, const ui::KeyEvent& key) { |
59 if (view->GetFocusManager()) | 70 if (view->GetFocusManager()) |
60 return view->GetFocusManager()->GetFocusedView(); | 71 return view->GetFocusManager()->GetFocusedView(); |
61 return NULL; | 72 return NULL; |
62 } | 73 } |
63 | 74 |
64 } // namespace aura | 75 } // namespace aura |
OLD | NEW |