Change touch selection handles to images given by UX.

ui/views/touchui/touch_selection_controller_impl.cc

 // 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.
 
 #include "ui/views/touchui/touch_selection_controller_impl.h"
 
 #include "base/time.h"
+#include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/views/corewm/shadow_types.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Constants defining the visual attributes of selection handles
-const int kSelectionHandleRadius = 10;
-const int kSelectionHandleAlpha = 0x7F;
-const SkColor kSelectionHandleColor =
-    SkColorSetA(SK_ColorBLACK, kSelectionHandleAlpha);
+const int kSelectionHandleLineWidth = 2;
+const SkColor kSelectionHandleLineColor =
+    SkColorSetRGB(0x42, 0x81, 0xf4);
 
 // The minimum selection size to trigger selection controller.
 const int kMinSelectionSize = 4;
 
 const int kContextMenuTimoutMs = 200;
 
-// Convenience struct to represent a circle shape.
-struct Circle {
-  int radius;
-  gfx::Point center;
-  SkColor color;
-};
-
 // Creates a widget to host SelectionHandleView.
 views::Widget* CreateTouchSelectionPopupWidget(
     gfx::NativeView context,
     views::WidgetDelegate* widget_delegate) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_TOOLTIP);
   params.can_activate = false;
   params.transparent = true;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.context = context;
   params.delegate = widget_delegate;
   widget->Init(params);
 #if defined(USE_AURA)
   SetShadowType(widget->GetNativeView(), views::corewm::SHADOW_TYPE_NONE);
 #endif
   return widget;
 }
 
-void PaintCircle(const Circle& circle, gfx::Canvas* canvas) {
-  SkPaint paint;
-  paint.setAntiAlias(true);
-  paint.setStyle(SkPaint::kFill_Style);
-  paint.setColor(circle.color);
-  canvas->DrawCircle(circle.center, circle.radius, paint);
+gfx::Image* GetHandleImage() {
+  static gfx::Image* handle_image = NULL;
+  if (!handle_image) {
+      handle_image = &ui::ResourceBundle::GetSharedInstance().GetImageNamed(

[sadrul, 2013/06/07 02:19:10]

indentation is off here.

[varunjain, 2013/06/07 06:09:04]

Done.

+          IDR_TEXT_SELECTION_HANDLE);
+  }
+  return handle_image;
+}
+
+gfx::Size GetHandleImageSize() {
+  return GetHandleImage()->Size();
 }
 
 // The points may not match exactly, since the selection range computation may
 // introduce some floating point errors. So check for a minimum size to decide
 // whether or not there is any selection.
 bool IsEmptySelection(const gfx::Point& p1, const gfx::Point& p2) {
   int delta_x = p2.x() - p1.x();
   int delta_y = p2.y() - p1.y();
   return (abs(delta_x) < kMinSelectionSize && abs(delta_y) < kMinSelectionSize);
 }
 
-gfx::Rect GetHandleBoundsFromCursor(const gfx::Rect& cursor) {
-  return gfx::Rect(cursor.x() - kSelectionHandleRadius, cursor.y(),
-          2 * kSelectionHandleRadius,
-          2 * kSelectionHandleRadius + cursor.height());
-}
-
 }  // namespace
 
 namespace views {
 
 // A View that displays the text selection handle.
 class TouchSelectionControllerImpl::EditingHandleView
     : public views::WidgetDelegateView {
  public:
   explicit EditingHandleView(TouchSelectionControllerImpl* controller,
                              gfx::NativeView context)
@@ skipping 11 matching lines @@
   }
 
   int cursor_height() const { return cursor_height_; }
 
   // Overridden from views::WidgetDelegateView:
   virtual bool WidgetHasHitTestMask() const OVERRIDE {
     return true;
   }
 
   virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE {
-    mask->addCircle(SkIntToScalar(kSelectionHandleRadius),
-                    SkIntToScalar(kSelectionHandleRadius + cursor_height_),
-                    SkIntToScalar(kSelectionHandleRadius));
+    gfx::Size image_size = GetHandleImageSize();
+    mask->addRect(SkIntToScalar(0), SkIntToScalar(cursor_height_),
+        SkIntToScalar(image_size.width()),
+        SkIntToScalar(cursor_height_ + image_size.height()));
   }
 
   virtual void DeleteDelegate() OVERRIDE {
     // We are owned and deleted by TouchSelectionController.
   }
 
   // Overridden from views::View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
-    Circle circle = {kSelectionHandleRadius, gfx::Point(kSelectionHandleRadius,
-                     kSelectionHandleRadius + cursor_height_),
-                     kSelectionHandleColor};
-    PaintCircle(circle, canvas);
-    canvas->DrawLine(gfx::Point(kSelectionHandleRadius, 0),
-        gfx::Point(kSelectionHandleRadius, cursor_height_),
-        kSelectionHandleColor);
+    gfx::Size image_size = GetHandleImageSize();
+    canvas->FillRect(
+        gfx::Rect(image_size.width() / 2 - kSelectionHandleLineWidth, 0,
+                  2 * kSelectionHandleLineWidth, cursor_height_),
+        kSelectionHandleLineColor);
+    canvas->DrawImageInt(*GetHandleImage()->ToImageSkia(), 0, cursor_height_);
   }
 
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
     event->SetHandled();
     switch (event->type()) {
       case ui::ET_GESTURE_SCROLL_BEGIN:
         controller_->SetDraggingHandle(this);
         break;
       case ui::ET_GESTURE_SCROLL_UPDATE:
         controller_->SelectionHandleDragged(event->location());
@@ skipping 11 matching lines @@
     if (visible != widget_->IsVisible()) {
       if (visible)
         widget_->Show();
       else
         widget_->Hide();
     }
     View::SetVisible(visible);
   }
 
   virtual gfx::Size GetPreferredSize() OVERRIDE {
-    return gfx::Size(2 * kSelectionHandleRadius,
-                     2 * kSelectionHandleRadius + cursor_height_);
+    gfx::Size image_size = GetHandleImageSize();
+    return gfx::Size(image_size.width(),
+                     image_size.height() + cursor_height_);
   }
 
   bool IsWidgetVisible() const {
     return widget_->IsVisible();
   }
 
   void SetSelectionRectInScreen(const gfx::Rect& rect) {
+    gfx::Size image_size = GetHandleImageSize();
     cursor_height_ = rect.height();
-    gfx::Rect widget_bounds = GetHandleBoundsFromCursor(rect);
+    gfx::Rect widget_bounds(rect.x() - image_size.width() / 2, rect.y(),
+        image_size.width(), rect.height() + image_size.height());
     widget_->SetBounds(widget_bounds);
   }
 
   gfx::Point GetScreenPosition() {
     return widget_->GetClientAreaBoundsInScreen().origin();
   }
 
  private:
   scoped_ptr<Widget> widget_;
   TouchSelectionControllerImpl* controller_;
@@ skipping 101 matching lines @@
     StartContextMenuTimer();
 }
 
 void TouchSelectionControllerImpl::SelectionHandleDragged(
     const gfx::Point& drag_pos) {
   // We do not want to show the context menu while dragging.
   HideContextMenu();
 
   DCHECK(dragging_handle_);
 
+  gfx::Size image_size = GetHandleImageSize();
   gfx::Point offset_drag_pos(drag_pos.x(),
       drag_pos.y() - dragging_handle_->cursor_height() / 2 -
-      2 * kSelectionHandleRadius);
+      image_size.height() / 2);
   ConvertPointToClientView(dragging_handle_, &offset_drag_pos);
   if (dragging_handle_ == cursor_handle_.get()) {
     client_view_->MoveCaretTo(offset_drag_pos);
     return;
   }
 
   // Find the stationary selection handle.
   EditingHandleView* fixed_handle = selection_handle_1_.get();
   if (fixed_handle == dragging_handle_)
     fixed_handle = selection_handle_2_.get();
 
   // Find selection end points in client_view's coordinate system.
-  gfx::Point p2(kSelectionHandleRadius, fixed_handle->cursor_height() / 2);
+  gfx::Point p2(image_size.width() / 2, fixed_handle->cursor_height() / 2);
   ConvertPointToClientView(fixed_handle, &p2);
 
   // Instruct client_view to select the region between p1 and p2. The position
   // of |fixed_handle| is the start and that of |dragging_handle| is the end
   // of selection.
   client_view_->SelectRect(p2, offset_drag_pos);
 }
 
 void TouchSelectionControllerImpl::ConvertPointToClientView(
     EditingHandleView* source, gfx::Point* point) {
   View::ConvertPointToScreen(source, point);
   client_view_->ConvertPointFromScreen(point);
 }
 
 bool TouchSelectionControllerImpl::IsCommandIdEnabled(int command_id) const {
   return client_view_->IsCommandIdEnabled(command_id);
 }
 
 void TouchSelectionControllerImpl::ExecuteCommand(int command_id,
                                                   int event_flags) {
   HideContextMenu();
   client_view_->ExecuteCommand(command_id, event_flags);
 }
 
 void TouchSelectionControllerImpl::OpenContextMenu() {
   gfx::Point anchor = context_menu_->anchor_rect().origin();
-  anchor.Offset(0, -kSelectionHandleRadius);
+//  anchor.Offset(0, -kSelectionHandleRadius);

[sadrul, 2013/06/07 02:19:10]

remove

[varunjain, 2013/06/07 06:09:04]

Done.

   HideContextMenu();
   client_view_->OpenContextMenu(anchor);
 }
 
 void TouchSelectionControllerImpl::OnMenuClosed(TouchEditingMenuView* menu) {
   if (menu == context_menu_)
     context_menu_ = NULL;
 }
 
 void TouchSelectionControllerImpl::OnWidgetClosing(Widget* widget) {
   DCHECK_EQ(client_widget_, widget);
   client_widget_ = NULL;
 }
 
 void TouchSelectionControllerImpl::OnWidgetBoundsChanged(
     Widget* widget,
     const gfx::Rect& new_bounds) {
   DCHECK_EQ(client_widget_, widget);
   HideContextMenu();
   SelectionChanged();
 }
 
 void TouchSelectionControllerImpl::ContextMenuTimerFired() {
   // Get selection end points in client_view's space.
   gfx::Rect r1, r2;
   client_view_->GetSelectionEndPoints(&r1, &r2);
 
-  gfx::Rect handle_1_bounds = GetHandleBoundsFromCursor(r1);
-  gfx::Rect handle_2_bounds = GetHandleBoundsFromCursor(r2);
+  gfx::Rect handle_1_bounds;
+  gfx::Rect handle_2_bounds;
+  if (cursor_handle_->IsWidgetVisible()) {
+    handle_1_bounds = cursor_handle_->GetBoundsInScreen();
+    handle_2_bounds = handle_1_bounds;
+  } else {
+    handle_1_bounds = selection_handle_1_->GetBoundsInScreen();
+    handle_2_bounds = selection_handle_2_->GetBoundsInScreen();
+  }
 
   // if selection is completely inside the view, we display the context menu
   // in the middle of the end points on the top. Else, we show it above the
   // visible handle. If no handle is visible, we do not show the menu.
   gfx::Rect menu_anchor;
   gfx::Rect client_bounds = client_view_->GetBounds();
   if (client_bounds.Contains(r1.origin()) &&
       client_bounds.Contains(r2.origin())) {
     menu_anchor = gfx::UnionRects(handle_1_bounds, handle_2_bounds);
   } else if (client_bounds.Contains(r1.origin())) {
     menu_anchor = handle_1_bounds;
   } else if (client_bounds.Contains(r2.origin())) {
     menu_anchor = handle_2_bounds;
   } else {
     return;
   }
 
-  gfx::Point menu_origin = menu_anchor.origin();
-  client_view_->ConvertPointToScreen(&menu_origin);
-  menu_anchor.set_origin(menu_origin);
-
   DCHECK(!context_menu_);
   context_menu_ = new TouchEditingMenuView(this, menu_anchor,
       client_view_->GetNativeView());
 }
 
 void TouchSelectionControllerImpl::StartContextMenuTimer() {
   if (context_menu_timer_.IsRunning())
     return;
   context_menu_timer_.Start(
       FROM_HERE,
@@ skipping 44 matching lines @@
 }
 
 ui::TouchSelectionController* ViewsTouchSelectionControllerFactory::create(
     ui::TouchEditable* client_view) {
   if (switches::IsTouchEditingEnabled())
     return new views::TouchSelectionControllerImpl(client_view);
   return NULL;
 }
 
 }  // namespace views