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

Unified Diff: ui/touch_selection/touch_selection_controller.h

Issue 1046783002: wip: Aura-specific implementation of unified touch selection: touch_selection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moving the responsibility for showing the menu into the client. Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/touch_selection/touch_handle_drawable_aura.cc ('k') | ui/touch_selection/touch_selection_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/touch_selection/touch_selection_controller.h
diff --git a/ui/touch_selection/touch_selection_controller.h b/ui/touch_selection/touch_selection_controller.h
index abc75b59ce7f588b603d2148bcba957cfc304eec..390b744b95bb92367b7d47e859290f148faf6912 100644
--- a/ui/touch_selection/touch_selection_controller.h
+++ b/ui/touch_selection/touch_selection_controller.h
@@ -8,19 +8,22 @@
#include "ui/base/touch/selection_bound.h"
#include "ui/gfx/geometry/point_f.h"
#include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/native_widget_types.h"
#include "ui/touch_selection/selection_event_type.h"
#include "ui/touch_selection/touch_handle.h"
#include "ui/touch_selection/touch_handle_orientation.h"
+#include "ui/touch_selection/touch_selection_menu_runner.h"
#include "ui/touch_selection/ui_touch_selection_export.h"
namespace ui {
class MotionEvent;
// Interface through which |TouchSelectionController| issues selection-related
-// commands, notifications and requests.
-class UI_TOUCH_SELECTION_EXPORT TouchSelectionControllerClient {
+// commands and requests.
+class UI_TOUCH_SELECTION_EXPORT TouchSelectionControllerClient
+ : public TouchSelectionMenuClient {
public:
- virtual ~TouchSelectionControllerClient() {}
+ ~TouchSelectionControllerClient() override {}
virtual bool SupportsAnimation() const = 0;
virtual void SetNeedsAnimate() = 0;
@@ -28,132 +31,74 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionControllerClient {
virtual void MoveRangeSelectionExtent(const gfx::PointF& extent) = 0;
virtual void SelectBetweenCoordinates(const gfx::PointF& base,
const gfx::PointF& extent) = 0;
- virtual void OnSelectionEvent(SelectionEventType event,
- const gfx::PointF& position) = 0;
+ virtual void OnSelectionEvent(SelectionEventType event) = 0;
+// virtual void OnNativeViewMoved() = 0;
+// virtual void OnOverscrollStarted() = 0;
+// virtual void OnOverscrollCompleted() = 0;
+// virtual void OnFlingCompleted() = 0;
virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() = 0;
+ //virtual void HideQuickMenu();
+ //virtual void ShowQuickMenu(gfx::Rect anchor_rect);
+ virtual gfx::Rect GetClientSize() const = 0;
+ virtual gfx::NativeView GetNativeView() const = 0;
};
// Controller for manipulating text selection via touch input.
class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
: public TouchHandleClient {
public:
- TouchSelectionController(TouchSelectionControllerClient* client,
- base::TimeDelta tap_timeout,
- float tap_slop,
- bool show_on_tap_for_empty_editable);
- ~TouchSelectionController() override;
+ ~TouchSelectionController() override {};
- // To be called when the selection bounds have changed.
+ // To be called when the selection bounds info has been updated.
// Note that such updates will trigger handle updates only if preceded
// by an appropriate call to allow automatic showing.
- void OnSelectionBoundsChanged(const SelectionBound& start,
- const SelectionBound& end);
+ // Return value specifies if anything has been updated or not.
+ virtual bool OnSelectionBoundsUpdated(const SelectionBound& start,
+ const SelectionBound& end) = 0;
// Allows touch-dragging of the handle.
// Returns true iff the event was consumed, in which case the caller should
// cease further handling of the event.
- bool WillHandleTouchEvent(const MotionEvent& event);
+ virtual bool WillHandleTouchEvent(const MotionEvent& event) = 0;
// To be called before forwarding a tap event. This allows automatically
// showing the insertion handle from subsequent bounds changes.
- void OnTapEvent();
+ virtual void OnTapEvent() = 0;
// To be called before forwarding a longpress event. This allows automatically
// showing the selection or insertion handles from subsequent bounds changes.
- void OnLongPressEvent();
+ virtual void OnLongPressEvent() = 0;
// Allow showing the selection handles from the most recent selection bounds
// update (if valid), or a future valid bounds update.
- void AllowShowingFromCurrentSelection();
+ virtual void AllowShowingFromCurrentSelection() = 0;
// Hide the handles and suppress bounds updates until the next explicit
// showing allowance.
- void HideAndDisallowShowingAutomatically();
+ virtual void HideAndDisallowShowingAutomatically() = 0;
// Override the handle visibility according to |hidden|.
- void SetTemporarilyHidden(bool hidden);
+ virtual void SetTemporarilyHidden(bool hidden) = 0;
// To be called when the editability of the focused region changes.
- void OnSelectionEditable(bool editable);
+ virtual void OnSelectionEditable(bool editable) = 0;
// To be called when the contents of the focused region changes.
- void OnSelectionEmpty(bool empty);
+ virtual void OnSelectionEmpty(bool empty) = 0;
// Ticks an active animation, as requested to the client by |SetNeedsAnimate|.
// Returns true if an animation is active and requires further ticking.
- bool Animate(base::TimeTicks animate_time);
-
- private:
- enum InputEventType { TAP, LONG_PRESS, INPUT_EVENT_TYPE_NONE };
-
- // TouchHandleClient implementation.
- void OnHandleDragBegin(const TouchHandle& handle) override;
- void OnHandleDragUpdate(const TouchHandle& handle,
- const gfx::PointF& new_position) override;
- void OnHandleDragEnd(const TouchHandle& handle) override;
- void OnHandleTapped(const TouchHandle& handle) override;
- void SetNeedsAnimate() override;
- scoped_ptr<TouchHandleDrawable> CreateDrawable() override;
- base::TimeDelta GetTapTimeout() const override;
- float GetTapSlop() const override;
-
- void ShowInsertionHandleAutomatically();
- void ShowSelectionHandlesAutomatically();
-
- void OnInsertionChanged();
- void OnSelectionChanged();
-
- void ActivateInsertion();
- void DeactivateInsertion();
- void ActivateSelection();
- void DeactivateSelection();
- void ResetCachedValuesIfInactive();
-
- const gfx::PointF& GetStartPosition() const;
- const gfx::PointF& GetEndPosition() const;
- gfx::Vector2dF GetStartLineOffset() const;
- gfx::Vector2dF GetEndLineOffset() const;
- bool GetStartVisible() const;
- bool GetEndVisible() const;
- TouchHandle::AnimationStyle GetAnimationStyle(bool was_active) const;
-
- void LogSelectionEnd();
-
- TouchSelectionControllerClient* const client_;
- const base::TimeDelta tap_timeout_;
- const float tap_slop_;
-
- // Controls whether an insertion handle is shown on a tap for an empty
- // editable text.
- bool show_on_tap_for_empty_editable_;
-
- InputEventType response_pending_input_event_;
-
- SelectionBound start_;
- SelectionBound end_;
- TouchHandleOrientation start_orientation_;
- TouchHandleOrientation end_orientation_;
-
- scoped_ptr<TouchHandle> insertion_handle_;
- bool is_insertion_active_;
- bool activate_insertion_automatically_;
-
- scoped_ptr<TouchHandle> start_selection_handle_;
- scoped_ptr<TouchHandle> end_selection_handle_;
- bool is_selection_active_;
- bool activate_selection_automatically_;
-
- bool selection_empty_;
- bool selection_editable_;
-
- bool temporarily_hidden_;
-
- base::TimeTicks selection_start_time_;
- // Whether a selection handle was dragged during the current 'selection
- // session' - i.e. since the current selection has been activated.
- bool selection_handle_dragged_;
-
- DISALLOW_COPY_AND_ASSIGN(TouchSelectionController);
+ virtual bool Animate(base::TimeTicks animate_time) = 0;
+
+ // Returns the bounding rect of the two selection bounds in client
+ // coordinates, clipped to the client bounds. If only one of the bounds is
+ // visible/shown, the rect is the bounding rect of that bound. If no bounds
+ // are shown, the rect is empty.
+ virtual gfx::Rect GetRectBetweenBounds() const = 0;
+
+ virtual void OnNativeViewMoved() = 0;
+ virtual void OnOverscrollStarted() = 0;
+ virtual void OnOverscrollCompleted() = 0;
};
} // namespace ui
« no previous file with comments | « ui/touch_selection/touch_handle_drawable_aura.cc ('k') | ui/touch_selection/touch_selection_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698