Clip Views textfield drag images to selected text.

ui/views/controls/textfield/textfield.cc

Index: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index 94888d7d2a16d4d3e4777688c84bb2ff8a70ab2d..339b3a37a61e65ffc9f571c79b20a9e56e608cbb 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -22,6 +22,7 @@
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/focusable_border.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/native/native_view_host.h"
@@ -37,23 +38,23 @@
 #include "base/win/win_util.h"
 #endif
 
+namespace views {
+
 namespace {
 
 // Default placeholder text color.
 const SkColor kDefaultPlaceholderTextColor = SK_ColorLTGRAY;
 
-void ConvertRectToScreen(const views::View* src, gfx::Rect* r) {
+void ConvertRectToScreen(const View* src, gfx::Rect* r) {
   DCHECK(src);
 
   gfx::Point new_origin = r->origin();
-  views::View::ConvertPointToScreen(src, &new_origin);
+  View::ConvertPointToScreen(src, &new_origin);
   r->set_origin(new_origin);
 }
 
 }  // namespace
 
-namespace views {
-
 // static
 const char Textfield::kViewClassName[] = "Textfield";
 
@@ -827,40 +828,42 @@ void Textfield::OnCompositionTextConfirmedOrCleared() {
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, ContextMenuController overrides:
 
-void Textfield::ShowContextMenuForView(
-    View* source,
-    const gfx::Point& point,
-    ui::MenuSourceType source_type) {
+void Textfield::ShowContextMenuForView(View* source,
+                                       const gfx::Point& point,
+                                       ui::MenuSourceType source_type) {
   UpdateContextMenu();
-  if (context_menu_runner_->RunMenuAt(GetWidget(), NULL,
-          gfx::Rect(point, gfx::Size()), views::MenuItemView::TOPLEFT,
-          source_type,
-          MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
-      MenuRunner::MENU_DELETED)
-    return;
+  ignore_result(context_menu_runner_->RunMenuAt(GetWidget(), NULL,
+      gfx::Rect(point, gfx::Size()), MenuItemView::TOPLEFT, source_type,
+      MenuRunner::HAS_MNEMONICS | MenuRunner::CONTEXT_MENU));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Textfield, views::DragController overrides:
+// Textfield, DragController overrides:
 
-void Textfield::WriteDragDataForView(views::View* sender,
+void Textfield::WriteDragDataForView(View* sender,
                                      const gfx::Point& press_pt,
                                      OSExchangeData* data) {
-  DCHECK_NE(ui::DragDropTypes::DRAG_NONE,
-            GetDragOperationsForView(sender, press_pt));
-  data->SetString(model_->GetSelectedText());
+  const base::string16& selected_text(GetSelectedText());
+  data->SetString(selected_text);
+  Label label(selected_text, GetFontList());
+  const SkColor background = GetBackgroundColor();
+  label.SetBackgroundColor(SkColorSetA(background, SK_AlphaTRANSPARENT));
+  label.SetBoundsRect(gfx::Rect(label.GetPreferredSize()));

[sky, 2014/03/05 23:28:43]

Should this be capped in anyway? What if the text is really really long?

[msw, 2014/03/06 00:00:42]

Good point! I tried some very long strings and it drew a broken canvas on Linux
Desktop Aura and crashed ChromeOS! I changed this to cap at the display width
(and textfield height) and now the same tests draw the beginning of the string
as you might expect without crashing CrOS. Thoughts?

   scoped_ptr<gfx::Canvas> canvas(
-      views::GetCanvasForDragImage(GetWidget(), size()));
-  GetRenderText()->DrawSelectedTextForDrag(canvas.get());
-  drag_utils::SetDragImageOnDataObject(*canvas, size(),
-                                       press_pt.OffsetFromOrigin(),
-                                       data);
+      GetCanvasForDragImage(GetWidget(), label.size()));
+  label.SetEnabledColor(GetTextColor());
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  // Desktop Linux Aura does not yet support transparency in drag images.
+  canvas->DrawColor(background);
+#endif
+  label.Paint(canvas.get());
+  static const gfx::Vector2d kOffset(-15, 0);

[sky, 2014/03/05 23:28:43]

nit: no static here.
Also, shouldn't the offset be based on the font size?

[msw, 2014/03/06 00:00:42]

Removed static. No, a (0,0) offset here puts the top left of the text drag image
at the cursor point. The 15px X-axis offset places it next to the cursor like
Unity on Goobuntu (so it's not overlapped and obscured by the cursor). The
Y-axis offset value here is ignored and clamped to 0 by
X11WholeScreenMoveLoop::SetDragImage. I think it looks okay, but perhaps we want
to change that in a followup CL?

+  drag_utils::SetDragImageOnDataObject(*canvas, label.size(), kOffset, data);
   if (controller_)
     controller_->OnWriteDragData(data);
 }
 
-int Textfield::GetDragOperationsForView(views::View* sender,
-                                        const gfx::Point& p) {
+int Textfield::GetDragOperationsForView(View* sender, const gfx::Point& p) {
   int drag_operations = ui::DragDropTypes::DRAG_COPY;
   if (!enabled() || text_input_type_ == ui::TEXT_INPUT_TYPE_PASSWORD ||
       !GetRenderText()->IsPointInSelection(p)) {