Implementing directional text selection handles

ui/base/touch/touch_editing_controller.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_BASE_TOUCH_TOUCH_EDITING_CONTROLLER_H_
 #define UI_BASE_TOUCH_TOUCH_EDITING_CONTROLLER_H_
 
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
 
+// Bound of a selected region.
+struct UI_BASE_EXPORT SelectionBound {
+ public:
+  enum Type {
+    LEFT,
+    RIGHT,
+    CENTER,
+    EMPTY,
+    LAST = EMPTY
+  };
+
+  SelectionBound();
+  virtual ~SelectionBound();

[sky, 2014/11/14 02:02:47]

Why is this virtual?

[mfomitchev, 2014/11/14 19:56:27]

Fixed

+
+  int GetHeight() const;
+
+  Type type;
+
+  gfx::Point edge_top;
+  gfx::Point edge_bottom;
+};
+
+UI_BASE_EXPORT bool operator==(const SelectionBound& lhs,
+                               const SelectionBound& rhs);
+UI_BASE_EXPORT bool operator!=(const SelectionBound& lhs,
+                               const SelectionBound& rhs);
+
+UI_BASE_EXPORT gfx::Rect RectBetweenSelectionBounds(const SelectionBound& b1,

[sky, 2014/11/14 02:02:47]

How about some test coverage?

[mfomitchev, 2014/11/14 19:56:27]

Done.

+                                                    const SelectionBound& b2);
+
 // An interface implemented by widget that has text that can be selected/edited
 // using touch.
 class UI_BASE_EXPORT TouchEditable : public ui::SimpleMenuModel::Delegate {
  public:
   // TODO(mohsen): Consider switching from local coordinates to screen
   // coordinates in this interface and see if it will simplify things.
 
   // Select everything between start and end (points are in view's local
   // coordinate system). |start| is the logical start and |end| is the logical
   // end of selection. Visually, |start| may lie after |end|.
   virtual void SelectRect(const gfx::Point& start, const gfx::Point& end) = 0;
 
   // Move the caret to |point|. |point| is in local coordinates.
   virtual void MoveCaretTo(const gfx::Point& point) = 0;
 
-  // Gets the end points of the current selection. The end points p1 and p2 must
-  // be the cursor rect for the start and end of selection (in local
-  // coordinates):
+  // Gets the end points of the current selection. The end points |anchor| and
+  // |focus| must be the cursor rect for the logical start and logical end of
+  // selection (in local coordinates):
   // ____________________________________
   // | textfield with |selected text|   |
   // ------------------------------------
-  //                  ^p1           ^p2
+  //                  ^anchor       ^focus
   //
-  // p1 should be the logical start and p2 the logical end of selection. Hence,
-  // visually, p1 could be to the right of p2 in the figure above.
-  virtual void GetSelectionEndPoints(gfx::Rect* p1, gfx::Rect* p2) = 0;
+  // Visually, anchor could be to the right of focus in the figure above - it
+  // depends on the selection direction.
+  virtual void GetSelectionEndPoints(ui::SelectionBound* anchor,
+                                     ui::SelectionBound* focus) = 0;
 
   // Gets the bounds of the client view in its local coordinates.
   virtual gfx::Rect GetBounds() = 0;
 
   // Gets the NativeView hosting the client.
   virtual gfx::NativeView GetNativeView() const = 0;
 
   // Converts a point to/from screen coordinates from/to client view.
   virtual void ConvertPointToScreen(gfx::Point* point) = 0;
   virtual void ConvertPointFromScreen(gfx::Point* point) = 0;
@@ skipping 37 matching lines @@
 class UI_BASE_EXPORT TouchSelectionControllerFactory {
  public:
   static void SetInstance(TouchSelectionControllerFactory* instance);
 
   virtual TouchSelectionController* create(TouchEditable* client_view) = 0;
 
  protected:
   virtual ~TouchSelectionControllerFactory() {}
 };
 
-}  // namespace views
+}  // namespace ui
 
 #endif  // UI_BASE_TOUCH_TOUCH_EDITING_CONTROLLER_H_