Re-land: NativeTextfieldViews: Show the drop cursor when dragging text

ui/views/controls/textfield/native_textfield_views.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/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 245 matching lines @@
 bool NativeTextfieldViews::CanDrop(const OSExchangeData& data) {
   int formats;
   std::set<OSExchangeData::CustomFormat> custom_formats;
   GetDropFormats(&formats, &custom_formats);
   return textfield_->enabled() && !textfield_->read_only() &&
       data.HasAnyFormat(formats, custom_formats);
 }
 
 int NativeTextfieldViews::OnDragUpdated(const ui::DropTargetEvent& event) {
   DCHECK(CanDrop(event.data()));
-  bool in_selection = GetRenderText()->IsPointInSelection(event.location());
+
+  const ui::Range& selection = GetRenderText()->selection();
+  drop_cursor_position_ = GetRenderText()->FindCursorPosition(event.location());
+  bool in_selection = !selection.is_empty() &&
+      GetRenderText()->RangeContainsCaret(
+          selection,
+          drop_cursor_position_.caret_pos(),
+          drop_cursor_position_.caret_affinity());
   is_drop_cursor_visible_ = !in_selection;
   // TODO(msw): Pan over text when the user drags to the visible text edge.
   OnCaretBoundsChanged();
   SchedulePaint();
 
   if (initiating_drag_) {
     if (in_selection)
       return ui::DragDropTypes::DRAG_NONE;
     return event.IsControlDown() ? ui::DragDropTypes::DRAG_COPY :
                                    ui::DragDropTypes::DRAG_MOVE;
   }
   return ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_MOVE;
 }
 
+void NativeTextfieldViews::OnDragExited() {
+  is_drop_cursor_visible_ = false;
+  SchedulePaint();
+}
+
 int NativeTextfieldViews::OnPerformDrop(const ui::DropTargetEvent& event) {
   DCHECK(CanDrop(event.data()));
 
+  is_drop_cursor_visible_ = false;

[ckocagil, 2013/04/16 19:20:25]

Added to fix a condition where OnDragDone isn't called after a drag.

+
   TextfieldController* controller = textfield_->GetController();
   if (controller) {
       int drag_operation = controller->OnDrop(event.data());
       if (drag_operation != ui::DragDropTypes::DRAG_NONE)
         return drag_operation;
   }
 
   DCHECK(!initiating_drag_ ||
          !GetRenderText()->IsPointInSelection(event.location()));
   OnBeforeUserAction();
@@ skipping 780 matching lines @@
 
 void NativeTextfieldViews::RepaintCursor() {
   gfx::Rect r(GetCaretBounds());
   r.Inset(-1, -1, -1, -1);
   SchedulePaintInRect(r);
 }
 
 void NativeTextfieldViews::PaintTextAndCursor(gfx::Canvas* canvas) {
   TRACE_EVENT0("views", "NativeTextfieldViews::PaintTextAndCursor");
   canvas->Save();
-  GetRenderText()->set_cursor_visible(is_drop_cursor_visible_ ||
-      (is_cursor_visible_ && !model_->HasSelection()));
+  GetRenderText()->set_cursor_visible(!is_drop_cursor_visible_ &&
+      is_cursor_visible_ && !model_->HasSelection());
   // Draw the text, cursor, and selection.
   GetRenderText()->Draw(canvas);
 
+  // Draw the detached drop cursor that marks where the text will be dropped.
+  if (is_drop_cursor_visible_)
+    GetRenderText()->DrawCursor(canvas, drop_cursor_position_);
+
   // Draw placeholder text if needed.
   if (model_->GetText().empty() &&
       !textfield_->placeholder_text().empty()) {
     canvas->DrawStringInt(
         textfield_->placeholder_text(),
         GetRenderText()->GetFont(),
         textfield_->placeholder_text_color(),
         GetRenderText()->display_rect());
   }
   canvas->Restore();
@@ skipping 314 matching lines @@
 
 void NativeTextfieldViews::PlatformGestureEventHandling(
     const ui::GestureEvent* event) {
 #if defined(OS_WIN) && defined(USE_AURA)
   if (event->type() == ui::ET_GESTURE_TAP_DOWN && !textfield_->read_only())
     base::win::DisplayVirtualKeyboard();
 #endif
 }
 
 }  // namespace views