Add method to TouchSelectionController to check if a handle is currently being

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/command_line.h"
 #include "base/time.h"
 #include "grit/ui_strings.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/canvas.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);
 
 // The minimum selection size to trigger selection controller.
 const int kMinSelectionSize = 4;
 
 const int kContextMenuTimoutMs = 500;
 
 // 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::Widget* widget = new views::Widget;
-  views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
+  views::Widget::InitParams params(views::Widget::InitParams::TYPE_TOOLTIP);

[sadrul, 2013/04/12 01:34:31]

Why do you need this change?

[varunjain, 2013/04/17 02:46:14]

Removed.

   params.can_activate = false;
   params.transparent = true;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.context = context;
   widget->Init(params);
+  SetShadowType(widget->GetNativeView(), views::corewm::SHADOW_TYPE_NONE);
   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);
 }
@@ skipping 182 matching lines @@
 
     if (client_view_->GetBounds().Contains(r2.origin())) {
       selection_handle_2_->SetSelectionRectInScreen(screen_rect_2);
       selection_handle_2_->SetVisible(true);
     } else {
       selection_handle_2_->SetVisible(false);
     }
   }
 }
 
+bool TouchSelectionControllerImpl::IsHandleDragInProgress() {
+  return !!dragging_handle_;
+}
+
 void TouchSelectionControllerImpl::SetDraggingHandle(
     EditingHandleView* handle) {
   dragging_handle_ = handle;
   if (dragging_handle_)
     HideContextMenu();
   else
     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::Point offset_drag_pos(drag_pos.x(),
+      drag_pos.y() - dragging_handle_->cursor_height() / 2 -
+      2 * kSelectionHandleRadius);
+  ConvertPointToClientView(dragging_handle_, &offset_drag_pos);
   if (dragging_handle_ == cursor_handle_.get()) {
-    gfx::Point p(drag_pos.x() + kSelectionHandleRadius, drag_pos.y());
-    ConvertPointToClientView(dragging_handle_, &p);
-    client_view_->MoveCaretTo(p);
+    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 p1(drag_pos.x() + kSelectionHandleRadius, drag_pos.y());
-  ConvertPointToClientView(dragging_handle_, &p1);
-
   gfx::Point p2(kSelectionHandleRadius, 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, p1);
+  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);
@@ skipping 118 matching lines @@
     ui::TouchEditable* client_view) {
 #if defined(OS_CHROMEOS)
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableTouchEditing))
     return new views::TouchSelectionControllerImpl(client_view);
 #endif
   return NULL;
 }
 
 }  // namespace views