Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Side by Side Diff: ui/views/button_drag_utils.cc

Issue 298813002: views: Move MenuButton from TextButton to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try fixing linux compile wrt NewAvatarButton. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/button_drag_utils.h" 5 #include "ui/views/button_drag_utils.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "grit/ui_resources.h" 8 #include "grit/ui_resources.h"
9 #include "ui/base/dragdrop/drag_utils.h" 9 #include "ui/base/dragdrop/drag_utils.h"
10 #include "ui/base/dragdrop/os_exchange_data.h" 10 #include "ui/base/dragdrop/os_exchange_data.h"
11 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/gfx/canvas.h" 12 #include "ui/gfx/canvas.h"
13 #include "ui/gfx/geometry/point.h"
13 #include "ui/gfx/image/image.h" 14 #include "ui/gfx/image/image.h"
14 #include "ui/views/controls/button/text_button.h" 15 #include "ui/views/controls/button/text_button.h"
15 #include "ui/views/drag_utils.h" 16 #include "ui/views/drag_utils.h"
16 #include "url/gurl.h" 17 #include "url/gurl.h"
17 18
18 namespace button_drag_utils { 19 namespace button_drag_utils {
19 20
20 // Maximum width of the link drag image in pixels. 21 // Maximum width of the link drag image in pixels.
21 static const int kLinkDragImageMaxWidth = 200; 22 static const int kLinkDragImageMaxWidth = 150;
22 23
23 void SetURLAndDragImage(const GURL& url, 24 void SetURLAndDragImage(const GURL& url,
24 const base::string16& title, 25 const base::string16& title,
25 const gfx::ImageSkia& icon, 26 const gfx::ImageSkia& icon,
27 const gfx::Point* press_pt,
26 ui::OSExchangeData* data, 28 ui::OSExchangeData* data,
27 views::Widget* widget) { 29 views::Widget* widget) {
28 DCHECK(url.is_valid() && data); 30 DCHECK(url.is_valid() && data);
31 data->SetURL(url, title);
32 SetDragImage(url, title, icon, press_pt, data, widget);
33 }
29 34
30 data->SetURL(url, title); 35 void SetDragImage(const GURL& url,
31 36 const base::string16& title,
37 const gfx::ImageSkia& icon,
38 const gfx::Point* press_pt,
39 ui::OSExchangeData* data,
40 views::Widget* widget) {
32 // Create a button to render the drag image for us. 41 // Create a button to render the drag image for us.
33 views::TextButton button(NULL, 42 views::TextButton button(NULL,
34 title.empty() ? base::UTF8ToUTF16(url.spec()) 43 title.empty() ? base::UTF8ToUTF16(url.spec())
35 : title); 44 : title);
36 button.set_max_width(kLinkDragImageMaxWidth); 45 button.set_max_width(kLinkDragImageMaxWidth);
37 if (icon.isNull()) { 46 if (icon.isNull()) {
38 button.SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageNamed( 47 button.SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageNamed(
39 IDR_DEFAULT_FAVICON).ToImageSkia()); 48 IDR_DEFAULT_FAVICON).ToImageSkia());
40 } else { 49 } else {
41 button.SetIcon(icon); 50 button.SetIcon(icon);
42 } 51 }
43 gfx::Size prefsize = button.GetPreferredSize(); 52 gfx::Size prefsize = button.GetPreferredSize();
44 button.SetBounds(0, 0, prefsize.width(), prefsize.height()); 53 button.SetBounds(0, 0, prefsize.width(), prefsize.height());
45 54
55 gfx::Vector2d press_point;
56 if (press_pt)
57 press_point = press_pt->OffsetFromOrigin();
58 else
59 press_point = gfx::Vector2d(prefsize.width() / 2, prefsize.height() / 2);
60
46 // Render the image. 61 // Render the image.
47 scoped_ptr<gfx::Canvas> canvas( 62 scoped_ptr<gfx::Canvas> canvas(
48 views::GetCanvasForDragImage(widget, prefsize)); 63 views::GetCanvasForDragImage(widget, prefsize));
49 button.PaintButton(canvas.get(), views::TextButton::PB_FOR_DRAG); 64 button.PaintButton(canvas.get(), views::TextButton::PB_FOR_DRAG);
50 drag_utils::SetDragImageOnDataObject(*canvas, prefsize, 65 drag_utils::SetDragImageOnDataObject(*canvas, prefsize,
51 gfx::Vector2d(prefsize.width() / 2, prefsize.height() / 2), data); 66 press_point, data);
msw 2014/06/11 00:55:46 nit: fits on line above.
52 } 67 }
53 68
54 } // namespace button_drag_utils 69 } // namespace button_drag_utils
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698