Fix gesture handling for Views textfields

ui/views/controls/textfield/textfield.cc

 // Copyright (c) 2012 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/textfield.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "grit/ui_strings.h"
@@ skipping 253 matching lines @@
       selection_text_color_(SK_ColorWHITE),
       selection_background_color_(SK_ColorBLUE),
       placeholder_text_color_(kDefaultPlaceholderTextColor),
       text_input_type_(ui::TEXT_INPUT_TYPE_TEXT),
       performing_user_action_(false),
       skip_input_method_cancel_composition_(false),
       cursor_visible_(false),
       drop_cursor_visible_(false),
       initiating_drag_(false),
       aggregated_clicks_(0),
+      drag_start_display_offset_(0),
+      touch_handles_hidden_due_to_scroll_(false),
       weak_ptr_factory_(this) {
   set_context_menu_controller(this);
   set_drag_controller(this);
   SetBorder(scoped_ptr<Border>(new FocusableBorder()));
   SetFocusable(true);
 
   if (ViewsDelegate::views_delegate) {
     password_reveal_duration_ = ViewsDelegate::views_delegate->
         GetDefaultTextfieldObscuredRevealDuration();
   }
@@ skipping 49 matching lines @@
 base::string16 Textfield::GetSelectedText() const {
   return model_->GetSelectedText();
 }
 
 void Textfield::SelectAll(bool reversed) {
   model_->SelectAll(reversed);
   UpdateSelectionClipboard();
   UpdateAfterChange(false, true);
 }
 
+void Textfield::SelectWordAt(const gfx::Point& point) {
+  model_->MoveCursorTo(point, false);
+  model_->SelectWord();
+  UpdateAfterChange(false, true);
+}
+
 void Textfield::ClearSelection() {
   model_->ClearSelection();
   UpdateAfterChange(false, true);
 }
 
 bool Textfield::HasSelection() const {
   return !GetSelectedRange().is_empty();
 }
 
 SkColor Textfield::GetTextColor() const {
@@ skipping 223 matching lines @@
       OnBeforeUserAction();
       initiating_drag_ = false;
       switch (aggregated_clicks_) {
         case 0:
           if (GetRenderText()->IsPointInSelection(event.location()))
             initiating_drag_ = true;
           else
             MoveCursorTo(event.location(), event.IsShiftDown());
           break;
         case 1:
-          model_->MoveCursorTo(event.location(), false);
-          model_->SelectWord();
-          UpdateAfterChange(false, true);
+          SelectWordAt(event.location());
           double_click_word_ = GetRenderText()->selection();
           break;
         case 2:
           SelectAll(false);
           break;
         default:
           NOTREACHED();
       }
       OnAfterUserAction();
     }
@@ skipping 87 matching lines @@
   return handled;
 }
 
 ui::TextInputClient* Textfield::GetTextInputClient() {
   return read_only_ ? NULL : this;
 }
 
 void Textfield::OnGestureEvent(ui::GestureEvent* event) {
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN:
-      OnBeforeUserAction();
       RequestFocus();
       ShowImeIfNeeded();
-
-      // We don't deselect if the point is in the selection
-      // because TAP_DOWN may turn into a LONG_PRESS.
-      if (!GetRenderText()->IsPointInSelection(event->location()))
-        MoveCursorTo(event->location(), false);
-      OnAfterUserAction();
-      event->SetHandled();
-      break;
-    case ui::ET_GESTURE_SCROLL_UPDATE:
-      OnBeforeUserAction();
-      MoveCursorTo(event->location(), true);
-      OnAfterUserAction();
-      event->SetHandled();
-      break;
-    case ui::ET_GESTURE_SCROLL_END:
-    case ui::ET_SCROLL_FLING_START:
-      CreateTouchSelectionControllerAndNotifyIt();
       event->SetHandled();
       break;
     case ui::ET_GESTURE_TAP:
       if (event->details().tap_count() == 1) {
-        CreateTouchSelectionControllerAndNotifyIt();
+        if (!GetRenderText()->IsPointInSelection(event->location())) {
+          OnBeforeUserAction();
+          MoveCursorTo(event->location(), false);
+          OnAfterUserAction();
+        }
+      } else if (event->details().tap_count() == 2) {
+        OnBeforeUserAction();
+        SelectWordAt(event->location());
+        OnAfterUserAction();
       } else {
-        DestroyTouchSelection();
         OnBeforeUserAction();
         SelectAll(false);
         OnAfterUserAction();
-        event->SetHandled();
       }
+      CreateTouchSelectionControllerAndNotifyIt();
 #if defined(OS_WIN)
       if (!read_only())
         base::win::DisplayVirtualKeyboard();
 #endif
+      event->SetHandled();
       break;
     case ui::ET_GESTURE_LONG_PRESS:
-      // If long press happens outside selection, select word and show context
-      // menu (If touch selection is enabled, context menu is shown by the
-      // |touch_selection_controller_|, hence we mark the event handled.
-      // Otherwise, the regular context menu will be shown by views).
-      // If long press happens in selected text and touch drag drop is enabled,
-      // we will turn off touch selection (if one exists) and let views do drag
-      // drop.
       if (!GetRenderText()->IsPointInSelection(event->location())) {
+        // If long-press happens outside selection, select word and try to
+        // activate touch selection.
         OnBeforeUserAction();
-        model_->SelectWord();
-        touch_selection_controller_.reset(
-            ui::TouchSelectionController::create(this));
-        UpdateAfterChange(false, true);
+        SelectWordAt(event->location());
         OnAfterUserAction();
+        CreateTouchSelectionControllerAndNotifyIt();
+        // If touch selection activated successfully, mark event as handled so
+        // that the regular context menu is not shown.
         if (touch_selection_controller_)
           event->SetHandled();
-      } else if (switches::IsTouchDragDropEnabled()) {
-        initiating_drag_ = true;
+      } else {
+        // If long-press happens on the selection, deactivate touch selection
+        // and try to initiate drag-drop. If drag-drop is not enabled, context
+        // menu will be shown. Event is not marked as handled to let Views
+        // handle drag-drop or context menu.
         DestroyTouchSelection();
-      } else {
-        if (!touch_selection_controller_)
-          CreateTouchSelectionControllerAndNotifyIt();
-        if (touch_selection_controller_)
-          event->SetHandled();
+        initiating_drag_ = switches::IsTouchDragDropEnabled();
       }
-      return;
+      break;
     case ui::ET_GESTURE_LONG_TAP:
-      if (!touch_selection_controller_)
-        CreateTouchSelectionControllerAndNotifyIt();
-
       // If touch selection is enabled, the context menu on long tap will be
       // shown by the |touch_selection_controller_|, hence we mark the event
-      // handled so views does not try to show context menu on it.
+      // handled so Views does not try to show context menu on it.
       if (touch_selection_controller_)
         event->SetHandled();
       break;
+    case ui::ET_GESTURE_SCROLL_BEGIN:
+      touch_handles_hidden_due_to_scroll_ = touch_selection_controller_;

[sky, 2014/07/21 22:37:43]

I'm surprised you don't get a compile warning here.

[mohsen, 2014/07/21 23:07:56]

Really? Didn't know it's not allowed. Fixed.

+      DestroyTouchSelection();
+      drag_start_location_ = event->location();
+      drag_start_display_offset_ =
+          GetRenderText()->GetUpdatedDisplayOffset().x();
+      event->SetHandled();
+      break;
+    case ui::ET_GESTURE_SCROLL_UPDATE: {
+      int new_offset = drag_start_display_offset_ + event->location().x() -
+          drag_start_location_.x();
+      GetRenderText()->SetDisplayOffset(new_offset);
+      SchedulePaint();
+      event->SetHandled();
+      break;
+    }
+    case ui::ET_GESTURE_SCROLL_END:
+    case ui::ET_SCROLL_FLING_START:
+      if (touch_handles_hidden_due_to_scroll_) {
+        CreateTouchSelectionControllerAndNotifyIt();
+        touch_handles_hidden_due_to_scroll_ = false;
+      }
+      event->SetHandled();
+      break;
     default:
       return;
   }
 }
 
 void Textfield::AboutToRequestFocusFromTabTraversal(bool reverse) {
   SelectAll(false);
 }
 
 bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ skipping 998 matching lines @@
       const size_t length = selection_clipboard_text.length();
       range = gfx::Range(range.start() + length, range.end() + length);
     }
     model_->MoveCursorTo(gfx::SelectionModel(range, affinity));
     UpdateAfterChange(true, true);
     OnAfterUserAction();
   }
 }
 
 }  // namespace views