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

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

Issue 884653003: gfx::ShadowValue: offset is a Vector2d, not Point. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile. Created 5 years, 9 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
« no previous file with comments | « ui/message_center/views/message_view.cc ('k') | ui/views/controls/button/blue_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/base/dragdrop/drag_utils.h" 8 #include "ui/base/dragdrop/drag_utils.h"
9 #include "ui/base/dragdrop/os_exchange_data.h" 9 #include "ui/base/dragdrop/os_exchange_data.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/gfx/canvas.h" 11 #include "ui/gfx/canvas.h"
12 #include "ui/gfx/geometry/point.h" 12 #include "ui/gfx/geometry/point.h"
13 #include "ui/gfx/geometry/vector2d.h"
13 #include "ui/gfx/image/image.h" 14 #include "ui/gfx/image/image.h"
14 #include "ui/resources/grit/ui_resources.h" 15 #include "ui/resources/grit/ui_resources.h"
15 #include "ui/views/controls/button/label_button.h" 16 #include "ui/views/controls/button/label_button.h"
16 #include "ui/views/drag_utils.h" 17 #include "ui/views/drag_utils.h"
17 #include "ui/views/widget/widget.h" 18 #include "ui/views/widget/widget.h"
18 #include "url/gurl.h" 19 #include "url/gurl.h"
19 20
20 namespace button_drag_utils { 21 namespace button_drag_utils {
21 22
22 // Maximum width of the link drag image in pixels. 23 // Maximum width of the link drag image in pixels.
(...skipping 18 matching lines...) Expand all
41 views::Widget* widget) { 42 views::Widget* widget) {
42 // Create a button to render the drag image for us. 43 // Create a button to render the drag image for us.
43 views::LabelButton button(NULL, 44 views::LabelButton button(NULL,
44 title.empty() ? base::UTF8ToUTF16(url.spec()) 45 title.empty() ? base::UTF8ToUTF16(url.spec())
45 : title); 46 : title);
46 button.SetTextSubpixelRenderingEnabled(false); 47 button.SetTextSubpixelRenderingEnabled(false);
47 const ui::NativeTheme* theme = 48 const ui::NativeTheme* theme =
48 widget ? widget->GetNativeTheme() : ui::NativeTheme::instance(); 49 widget ? widget->GetNativeTheme() : ui::NativeTheme::instance();
49 button.SetTextColor(views::Button::STATE_NORMAL, 50 button.SetTextColor(views::Button::STATE_NORMAL,
50 theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor)); 51 theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor));
51 gfx::ShadowValues shadows(10, gfx::ShadowValue(gfx::Point(0,0), 1.0f, 52 gfx::ShadowValues shadows(
52 theme->GetSystemColor(ui::NativeTheme::kColorId_LabelBackgroundColor))); 53 10,
54 gfx::ShadowValue(gfx::Vector2d(0, 0), 1.0f,
55 theme->GetSystemColor(
56 ui::NativeTheme::kColorId_LabelBackgroundColor)));
53 button.SetTextShadows(shadows); 57 button.SetTextShadows(shadows);
54 button.SetMaxSize(gfx::Size(kLinkDragImageMaxWidth, 0)); 58 button.SetMaxSize(gfx::Size(kLinkDragImageMaxWidth, 0));
55 if (icon.isNull()) { 59 if (icon.isNull()) {
56 button.SetImage(views::Button::STATE_NORMAL, 60 button.SetImage(views::Button::STATE_NORMAL,
57 *ui::ResourceBundle::GetSharedInstance().GetImageNamed( 61 *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
58 IDR_DEFAULT_FAVICON).ToImageSkia()); 62 IDR_DEFAULT_FAVICON).ToImageSkia());
59 } else { 63 } else {
60 button.SetImage(views::Button::STATE_NORMAL, icon); 64 button.SetImage(views::Button::STATE_NORMAL, icon);
61 } 65 }
62 gfx::Size prefsize = button.GetPreferredSize(); 66 gfx::Size prefsize = button.GetPreferredSize();
63 button.SetBounds(0, 0, prefsize.width(), prefsize.height()); 67 button.SetBounds(0, 0, prefsize.width(), prefsize.height());
64 68
65 gfx::Vector2d press_point; 69 gfx::Vector2d press_point;
66 if (press_pt) 70 if (press_pt)
67 press_point = press_pt->OffsetFromOrigin(); 71 press_point = press_pt->OffsetFromOrigin();
68 else 72 else
69 press_point = gfx::Vector2d(prefsize.width() / 2, prefsize.height() / 2); 73 press_point = gfx::Vector2d(prefsize.width() / 2, prefsize.height() / 2);
70 74
71 // Render the image. 75 // Render the image.
72 scoped_ptr<gfx::Canvas> canvas( 76 scoped_ptr<gfx::Canvas> canvas(
73 views::GetCanvasForDragImage(widget, prefsize)); 77 views::GetCanvasForDragImage(widget, prefsize));
74 button.Paint(canvas.get(), views::CullSet()); 78 button.Paint(canvas.get(), views::CullSet());
75 drag_utils::SetDragImageOnDataObject(*canvas, press_point, data); 79 drag_utils::SetDragImageOnDataObject(*canvas, press_point, data);
76 } 80 }
77 81
78 } // namespace button_drag_utils 82 } // namespace button_drag_utils
OLDNEW
« no previous file with comments | « ui/message_center/views/message_view.cc ('k') | ui/views/controls/button/blue_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698