Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: ui/touch_selection/touch_handle.h

Issue 481683003: Support for Adaptive Handle Orientation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed few inverting issues checked on Chrome Public apk Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef UI_TOUCH_SELECTION_TOUCH_HANDLE_H_ 5 #ifndef UI_TOUCH_SELECTION_TOUCH_HANDLE_H_
6 #define UI_TOUCH_SELECTION_TOUCH_HANDLE_H_ 6 #define UI_TOUCH_SELECTION_TOUCH_HANDLE_H_
7 7
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "ui/events/gesture_detection/motion_event.h" 11 #include "ui/events/gesture_detection/motion_event.h"
12 #include "ui/gfx/geometry/point_f.h" 12 #include "ui/gfx/geometry/point_f.h"
13 #include "ui/gfx/geometry/rect_f.h" 13 #include "ui/gfx/geometry/rect_f.h"
14 #include "ui/gfx/geometry/vector2d_f.h" 14 #include "ui/gfx/geometry/vector2d_f.h"
15 #include "ui/touch_selection/touch_handle_orientation.h" 15 #include "ui/touch_selection/touch_handle_orientation.h"
16 #include "ui/touch_selection/ui_touch_selection_export.h" 16 #include "ui/touch_selection/ui_touch_selection_export.h"
17 17
18 namespace ui { 18 namespace ui {
19 19
20 class TouchHandle; 20 class TouchHandle;
21 21
22 // Interface through which |TouchHandle| delegates rendering-specific duties. 22 // Interface through which |TouchHandle| delegates rendering-specific duties.
23 class UI_TOUCH_SELECTION_EXPORT TouchHandleDrawable { 23 class UI_TOUCH_SELECTION_EXPORT TouchHandleDrawable {
24 public: 24 public:
25 virtual ~TouchHandleDrawable() {} 25 virtual ~TouchHandleDrawable() {}
26 virtual void SetEnabled(bool enabled) = 0; 26 virtual void SetEnabled(bool enabled) = 0;
27 virtual void SetOrientation(TouchHandleOrientation orientation) = 0; 27 virtual void SetLayout(const gfx::PointF& position,
28 ui::TouchHandleOrientation orientation,
29 bool mirror_vertical,
30 bool mirror_horizontal,
31 bool mirror_changed) = 0;
28 virtual void SetAlpha(float alpha) = 0; 32 virtual void SetAlpha(float alpha) = 0;
29 virtual void SetFocus(const gfx::PointF& position) = 0;
30 virtual gfx::RectF GetVisibleBounds() const = 0; 33 virtual gfx::RectF GetVisibleBounds() const = 0;
31 }; 34 };
32 35
33 // Interface through which |TouchHandle| communicates handle manipulation and 36 // Interface through which |TouchHandle| communicates handle manipulation and
34 // requests concrete drawable instances. 37 // requests concrete drawable instances.
35 class UI_TOUCH_SELECTION_EXPORT TouchHandleClient { 38 class UI_TOUCH_SELECTION_EXPORT TouchHandleClient {
36 public: 39 public:
37 virtual ~TouchHandleClient() {} 40 virtual ~TouchHandleClient() {}
38 virtual void OnHandleDragBegin(const TouchHandle& handle) = 0; 41 virtual void OnHandleDragBegin(const TouchHandle& handle) = 0;
39 virtual void OnHandleDragUpdate(const TouchHandle& handle, 42 virtual void OnHandleDragUpdate(const TouchHandle& handle,
40 const gfx::PointF& new_position) = 0; 43 const gfx::PointF& new_position) = 0;
41 virtual void OnHandleDragEnd(const TouchHandle& handle) = 0; 44 virtual void OnHandleDragEnd(const TouchHandle& handle) = 0;
42 virtual void OnHandleTapped(const TouchHandle& handle) = 0; 45 virtual void OnHandleTapped(const TouchHandle& handle) = 0;
43 virtual void SetNeedsAnimate() = 0; 46 virtual void SetNeedsAnimate() = 0;
44 virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() = 0; 47 virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() = 0;
45 virtual base::TimeDelta GetTapTimeout() const = 0; 48 virtual base::TimeDelta GetTapTimeout() const = 0;
46 virtual float GetTapSlop() const = 0; 49 virtual float GetTapSlop() const = 0;
47 }; 50 };
48 51
49 // Responsible for displaying a selection or insertion handle for text 52 // Responsible for displaying a selection or insertion handle for text
50 // interaction. 53 // interaction.
51 class UI_TOUCH_SELECTION_EXPORT TouchHandle { 54 class UI_TOUCH_SELECTION_EXPORT TouchHandle {
52 public: 55 public:
53 // The drawable will be enabled but invisible until otherwise specified. 56 // The drawable will be enabled but invisible until otherwise specified.
54 TouchHandle(TouchHandleClient* client, TouchHandleOrientation orientation); 57 TouchHandle(TouchHandleClient* client,
58 TouchHandleOrientation orientation,
59 const gfx::RectF viewport_rect);
55 ~TouchHandle(); 60 ~TouchHandle();
56 61
57 // Sets whether the handle is active, allowing resource cleanup if necessary. 62 // Sets whether the handle is active, allowing resource cleanup if necessary.
58 // If false, active animations or touch drag sequences will be cancelled. 63 // If false, active animations or touch drag sequences will be cancelled.
59 // While disabled, manipulation is *explicitly not supported*, and may lead to 64 // While disabled, manipulation is *explicitly not supported*, and may lead to
60 // undesirable and/or unstable side-effects. The handle can be safely 65 // undesirable and/or unstable side-effects. The handle can be safely
61 // re-enabled to allow continued operation. 66 // re-enabled to allow continued operation.
62 void SetEnabled(bool enabled); 67 void SetEnabled(bool enabled);
63 68
64 enum AnimationStyle { ANIMATION_NONE, ANIMATION_SMOOTH }; 69 enum AnimationStyle { ANIMATION_NONE, ANIMATION_SMOOTH };
65 // Update the handle visibility, fading in/out according to |animation_style|. 70 // Update the handle visibility, fading in/out according to |animation_style|.
66 // If an animation is in-progress, it will be overriden appropriately. 71 // If an animation is in-progress, it will be overriden appropriately.
67 void SetVisible(bool visible, AnimationStyle animation_style); 72 void SetVisible(bool visible, AnimationStyle animation_style);
68 73
69 // Update the handle placement to |position|. 74 // Update the focus points for the handles. The Handle will be positioned
75 // either |top| or |bottom| based on the mirror parameters.
70 // Note: If a fade out animation is active or the handle is invisible, the 76 // Note: If a fade out animation is active or the handle is invisible, the
71 // handle position will not be updated until the handle regains visibility. 77 // handle position will not be updated until the handle regains visibility.
72 void SetPosition(const gfx::PointF& position); 78 void SetFocus(const gfx::PointF& top, const gfx::PointF& bottom);
79
80 // Update the Viewport rect, based on which the handle decide its inversion
81 void SetViewportRect(const gfx::RectF viewport_rect);
73 82
74 // Update the handle visuals to |orientation|. 83 // Update the handle visuals to |orientation|.
75 // Note: If the handle is being dragged, the orientation change will be 84 // Note: If the handle is being dragged, the orientation change will be
76 // deferred until the drag has ceased. 85 // deferred until the drag has ceased.
77 void SetOrientation(TouchHandleOrientation orientation); 86 void SetOrientation(TouchHandleOrientation orientation);
78 87
79 // Allows touch-dragging of the handle. Returns true if the event was 88 // Allows touch-dragging of the handle. Returns true if the event was
80 // consumed, in which case the caller should cease further handling. 89 // consumed, in which case the caller should cease further handling.
81 bool WillHandleTouchEvent(const MotionEvent& event); 90 bool WillHandleTouchEvent(const MotionEvent& event);
82 91
83 // Ticks an active animation, as requested to the client by |SetNeedsAnimate|. 92 // Ticks an active animation, as requested to the client by |SetNeedsAnimate|.
84 // Returns true if an animation is active and requires further ticking. 93 // Returns true if an animation is active and requires further ticking.
85 bool Animate(base::TimeTicks frame_time); 94 bool Animate(base::TimeTicks frame_time);
86 95
87 // Get the visible bounds of the handle, based on the current position and 96 // Get the visible bounds of the handle, based on the current position and
88 // the drawable's size/orientation. If the handle is invisible or disabled, 97 // the drawable's size/orientation. If the handle is invisible or disabled,
89 // the bounds will be empty. 98 // the bounds will be empty.
90 gfx::RectF GetVisibleBounds() const; 99 gfx::RectF GetVisibleBounds() const;
91 100
92 bool is_dragging() const { return is_dragging_; } 101 bool is_dragging() const { return is_dragging_; }
93 const gfx::PointF& position() const { return position_; } 102 const gfx::PointF& focus_bottom() const { return focus_bottom_; }
94 TouchHandleOrientation orientation() const { return orientation_; } 103 TouchHandleOrientation orientation() const { return orientation_; }
95 104
96 private: 105 private:
106 void UpdateLayout();
97 void BeginDrag(); 107 void BeginDrag();
98 void EndDrag(); 108 void EndDrag();
99 void BeginFade(); 109 void BeginFade();
100 void EndFade(); 110 void EndFade();
101 void SetAlpha(float alpha); 111 void SetAlpha(float alpha);
102 112
103 scoped_ptr<TouchHandleDrawable> drawable_; 113 scoped_ptr<TouchHandleDrawable> drawable_;
104 114
105 TouchHandleClient* const client_; 115 TouchHandleClient* const client_;
106 116
107 gfx::PointF position_; 117 gfx::PointF focus_bottom_;
118 gfx::PointF focus_top_;
119 gfx::RectF viewport_rect_;
108 TouchHandleOrientation orientation_; 120 TouchHandleOrientation orientation_;
109 TouchHandleOrientation deferred_orientation_; 121 TouchHandleOrientation deferred_orientation_;
110 122
111 gfx::PointF touch_down_position_; 123 gfx::PointF touch_down_position_;
112 gfx::Vector2dF touch_to_focus_offset_; 124 gfx::Vector2dF touch_to_focus_offset_;
113 base::TimeTicks touch_down_time_; 125 base::TimeTicks touch_down_time_;
114 126
115 // Note that when a fade animation is active, |is_visible_| and |position_| 127 // Note that when a fade animation is active, |is_visible_| and |position_|
116 // may not reflect the actual visibilty and position of the drawable. This 128 // may not reflect the actual visibilty and position of the drawable. This
117 // discrepancy is resolved either upon fade completion or cancellation. 129 // discrepancy is resolved either upon fade completion or cancellation.
118 base::TimeTicks fade_end_time_; 130 base::TimeTicks fade_end_time_;
119 gfx::PointF fade_start_position_; 131 gfx::PointF fade_start_position_;
120 float alpha_; 132 float alpha_;
121 bool animate_deferred_fade_; 133 bool animate_deferred_fade_;
122 134
123 bool enabled_; 135 bool enabled_;
124 bool is_visible_; 136 bool is_visible_;
125 bool is_dragging_; 137 bool is_dragging_;
126 bool is_drag_within_tap_region_; 138 bool is_drag_within_tap_region_;
127 139
140 // Mirror variables determine if the handles should be inverted or not.
141 bool mirror_vertical_;
142 bool mirror_horizontal_;
143
128 DISALLOW_COPY_AND_ASSIGN(TouchHandle); 144 DISALLOW_COPY_AND_ASSIGN(TouchHandle);
129 }; 145 };
130 146
131 } // namespace ui 147 } // namespace ui
132 148
133 #endif // UI_TOUCH_SELECTION_TOUCH_HANDLE_H_ 149 #endif // UI_TOUCH_SELECTION_TOUCH_HANDLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698