OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/ui/views/profiles/new_avatar_button.h" | 5 #include "chrome/browser/ui/views/profiles/new_avatar_button.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "chrome/app/vector_icons/vector_icons.h" | 10 #include "chrome/app/vector_icons/vector_icons.h" |
11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/profiles/profile_attributes_entry.h" | 12 #include "chrome/browser/profiles/profile_attributes_entry.h" |
13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
14 #include "chrome/browser/profiles/profiles_state.h" | 14 #include "chrome/browser/profiles/profiles_state.h" |
15 #include "chrome/browser/signin/signin_manager_factory.h" | |
15 #include "chrome/browser/ui/views/profiles/avatar_button_delegate.h" | 16 #include "chrome/browser/ui/views/profiles/avatar_button_delegate.h" |
16 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" | 17 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" |
18 #include "chrome/browser/ui/views/tabs/tab_strip.h" | |
17 #include "chrome/grit/theme_resources.h" | 19 #include "chrome/grit/theme_resources.h" |
18 #include "components/signin/core/common/profile_management_switches.h" | 20 #include "components/signin/core/common/profile_management_switches.h" |
19 #include "ui/base/resource/resource_bundle.h" | 21 #include "ui/base/resource/resource_bundle.h" |
20 #include "ui/gfx/canvas.h" | 22 #include "ui/gfx/canvas.h" |
21 #include "ui/gfx/color_palette.h" | 23 #include "ui/gfx/color_palette.h" |
22 #include "ui/gfx/geometry/vector2d.h" | 24 #include "ui/gfx/geometry/vector2d.h" |
23 #include "ui/gfx/paint_vector_icon.h" | 25 #include "ui/gfx/paint_vector_icon.h" |
24 #include "ui/vector_icons/vector_icons.h" | 26 #include "ui/vector_icons/vector_icons.h" |
27 #include "ui/views/animation/flood_fill_ink_drop_ripple.h" | |
28 #include "ui/views/animation/ink_drop_impl.h" | |
25 #include "ui/views/border.h" | 29 #include "ui/views/border.h" |
26 #include "ui/views/controls/button/label_button_border.h" | 30 #include "ui/views/controls/button/label_button_border.h" |
27 #include "ui/views/painter.h" | 31 #include "ui/views/painter.h" |
28 | 32 |
29 #if defined(OS_WIN) | 33 #if defined(OS_WIN) |
30 #include "base/win/windows_version.h" | 34 #include "base/win/windows_version.h" |
31 #endif | 35 #endif |
32 | 36 |
33 namespace { | 37 // Minimum and maximum width of the MD button |
38 const int kMdButtonMinWidth = 48; | |
39 const int kMdButtonMaxWidth = 96; | |
40 // Height of the non-MD (pre-Windows 10) button | |
41 const int kButtonNonMdHeight = 20; | |
42 // Height of the "cozy" MD button that ("tall" MD button height is computed) | |
43 const int kButtonMdCozyHeight = 22; | |
44 // Opacity of the ink drop on hover | |
45 const float kHighlightInkDropOpacity = 0.08f; | |
46 // Opacity of the ink drop on click, which is added to kHighlightInkDropOpacity | |
47 const float kRippleInkDropOpacity = 0.04f; | |
34 | 48 |
35 std::unique_ptr<views::Border> CreateBorder(const int normal_image_set[], | 49 AvatarButton::AvatarButton(AvatarButtonDelegate* delegate, Profile* profile) |
36 const int hot_image_set[], | 50 : MenuButton(base::string16(), delegate, false), |
37 const int pushed_image_set[]) { | |
38 std::unique_ptr<views::LabelButtonAssetBorder> border( | |
39 new views::LabelButtonAssetBorder(views::Button::STYLE_TEXTBUTTON)); | |
40 border->SetPainter(false, views::Button::STATE_NORMAL, | |
41 views::Painter::CreateImageGridPainter(normal_image_set)); | |
42 border->SetPainter(false, views::Button::STATE_HOVERED, | |
43 views::Painter::CreateImageGridPainter(hot_image_set)); | |
44 border->SetPainter(false, views::Button::STATE_PRESSED, | |
45 views::Painter::CreateImageGridPainter(pushed_image_set)); | |
46 | |
47 const int kLeftRightInset = 8; | |
48 const int kTopInset = 2; | |
49 const int kBottomInset = 4; | |
50 border->set_insets(gfx::Insets(kTopInset, kLeftRightInset, | |
51 kBottomInset, kLeftRightInset)); | |
52 | |
53 return std::move(border); | |
54 } | |
55 | |
56 } // namespace | |
57 | |
58 NewAvatarButton::NewAvatarButton(AvatarButtonDelegate* delegate, | |
59 AvatarButtonStyle button_style, | |
60 Profile* profile) | |
61 : LabelButton(delegate, base::string16()), | |
62 delegate_(delegate), | 51 delegate_(delegate), |
63 error_controller_(this, profile), | 52 error_controller_(this, profile), |
64 profile_(profile), | 53 profile_(profile) { |
65 suppress_mouse_released_action_(false) { | 54 set_notify_action(CustomButton::NOTIFY_ON_PRESS); |
66 set_triggerable_event_flags( | 55 set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON | |
67 ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON); | 56 ui::EF_RIGHT_MOUSE_BUTTON); |
68 set_animate_on_state_change(false); | 57 set_animate_on_state_change(false); |
69 SetEnabledTextColors(SK_ColorWHITE); | 58 SetEnabledTextColors(SK_ColorWHITE); |
70 SetTextSubpixelRenderingEnabled(false); | 59 SetTextSubpixelRenderingEnabled(false); |
71 SetHorizontalAlignment(gfx::ALIGN_CENTER); | 60 SetHorizontalAlignment(gfx::ALIGN_CENTER); |
72 | 61 |
62 g_browser_process->profile_manager() | |
63 ->GetProfileAttributesStorage() | |
64 .AddObserver(this); | |
65 | |
73 // The largest text height that fits in the button. If the font list height | 66 // The largest text height that fits in the button. If the font list height |
74 // is larger than this, it will be shrunk to match it. | 67 // is larger than this, it will be shrunk to match it. |
75 // TODO(noms): Calculate this constant algorithmically from the button's size. | 68 // TODO(noms): Calculate this constant algorithmically from the button's size. |
76 const int kDisplayFontHeight = 16; | 69 const int kDisplayFontHeight = 16; |
77 SetFontList( | 70 SetFontList( |
78 label()->font_list().DeriveWithHeightUpperBound(kDisplayFontHeight)); | 71 label()->font_list().DeriveWithHeightUpperBound(kDisplayFontHeight)); |
79 | |
80 ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); | |
81 if (button_style == AvatarButtonStyle::THEMED) { | |
82 const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_NORMAL); | |
83 const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_HOVER); | |
84 const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_PRESSED); | |
85 | |
86 SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet)); | |
87 generic_avatar_ = | |
88 *rb->GetImageNamed(IDR_AVATAR_THEMED_BUTTON_AVATAR).ToImageSkia(); | |
89 #if defined(OS_WIN) | |
90 } else if (base::win::GetVersion() < base::win::VERSION_WIN8) { | |
91 const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_NORMAL); | |
92 const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_HOVER); | |
93 const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_PRESSED); | |
94 | |
95 SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet)); | |
96 generic_avatar_ = | |
97 *rb->GetImageNamed(IDR_AVATAR_GLASS_BUTTON_AVATAR).ToImageSkia(); | |
98 #endif | |
99 } else { | |
100 const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_NATIVE_BUTTON_NORMAL); | |
101 const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_NATIVE_BUTTON_HOVER); | |
102 const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_NATIVE_BUTTON_PRESSED); | |
103 | |
104 SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet)); | |
105 generic_avatar_ = | |
106 *rb->GetImageNamed(IDR_AVATAR_NATIVE_BUTTON_AVATAR).ToImageSkia(); | |
107 } | |
108 | |
109 g_browser_process->profile_manager()-> | |
110 GetProfileAttributesStorage().AddObserver(this); | |
111 Update(); | |
112 SchedulePaint(); | |
113 } | 72 } |
114 | 73 |
115 NewAvatarButton::~NewAvatarButton() { | 74 AvatarButton::~AvatarButton() { |
116 g_browser_process->profile_manager()-> | 75 g_browser_process->profile_manager() |
117 GetProfileAttributesStorage().RemoveObserver(this); | 76 ->GetProfileAttributesStorage() |
77 .RemoveObserver(this); | |
118 } | 78 } |
119 | 79 |
120 bool NewAvatarButton::OnMousePressed(const ui::MouseEvent& event) { | 80 bool AvatarButton::IsTriggerableEvent(const ui::Event& event) { |
121 // Prevent the bubble from being re-shown if it's already showing. | 81 return event.type() == ui::ET_GESTURE_LONG_PRESS || |
122 suppress_mouse_released_action_ = ProfileChooserView::IsShowing(); | 82 MenuButton::IsTriggerableEvent(event); |
123 return LabelButton::OnMousePressed(event); | |
124 } | 83 } |
125 | 84 |
126 void NewAvatarButton::OnMouseReleased(const ui::MouseEvent& event) { | 85 void AvatarButton::OnAvatarErrorChanged() { |
127 if (suppress_mouse_released_action_) | |
128 suppress_mouse_released_action_ = false; | |
129 else | |
130 LabelButton::OnMouseReleased(event); | |
131 } | |
132 | |
133 void NewAvatarButton::OnGestureEvent(ui::GestureEvent* event) { | |
134 // TODO(wjmaclean): The check for ET_GESTURE_LONG_PRESS is done here since | |
135 // no other UI button based on CustomButton appears to handle mouse | |
136 // right-click. If other cases are identified, it may make sense to move this | |
137 // check to CustomButton. | |
138 if (event->type() == ui::ET_GESTURE_LONG_PRESS) | |
139 NotifyClick(*event); | |
140 else | |
141 LabelButton::OnGestureEvent(event); | |
142 } | |
143 | |
144 void NewAvatarButton::OnAvatarErrorChanged() { | |
145 Update(); | 86 Update(); |
146 } | 87 } |
147 | 88 |
148 void NewAvatarButton::OnProfileAdded(const base::FilePath& profile_path) { | 89 void AvatarButton::OnProfileAdded(const base::FilePath& profile_path) { |
149 Update(); | 90 Update(); |
150 } | 91 } |
151 | 92 |
152 void NewAvatarButton::OnProfileWasRemoved( | 93 void AvatarButton::OnProfileWasRemoved(const base::FilePath& profile_path, |
153 const base::FilePath& profile_path, | 94 const base::string16& profile_name) { |
154 const base::string16& profile_name) { | |
155 // If deleting the active profile, don't bother updating the avatar | 95 // If deleting the active profile, don't bother updating the avatar |
156 // button, as the browser window is being closed anyway. | 96 // button, as the browser window is being closed anyway. |
157 if (profile_->GetPath() != profile_path) | 97 if (profile_->GetPath() != profile_path) |
158 Update(); | 98 Update(); |
159 } | 99 } |
160 | 100 |
161 void NewAvatarButton::OnProfileNameChanged( | 101 void AvatarButton::OnProfileNameChanged( |
162 const base::FilePath& profile_path, | 102 const base::FilePath& profile_path, |
163 const base::string16& old_profile_name) { | 103 const base::string16& old_profile_name) { |
164 if (profile_->GetPath() == profile_path) | 104 if (profile_->GetPath() == profile_path) |
165 Update(); | 105 Update(); |
166 } | 106 } |
167 | 107 |
168 void NewAvatarButton::OnProfileSupervisedUserIdChanged( | 108 void AvatarButton::OnProfileSupervisedUserIdChanged( |
169 const base::FilePath& profile_path) { | 109 const base::FilePath& profile_path) { |
170 if (profile_->GetPath() == profile_path) | 110 if (profile_->GetPath() == profile_path) |
171 Update(); | 111 Update(); |
172 } | 112 } |
173 | 113 |
174 void NewAvatarButton::Update() { | 114 void AvatarButton::Update() { |
175 ProfileAttributesStorage& storage = | 115 ProfileAttributesStorage& storage = |
176 g_browser_process->profile_manager()->GetProfileAttributesStorage(); | 116 g_browser_process->profile_manager()->GetProfileAttributesStorage(); |
177 | 117 |
178 // If we have a single local profile, then use the generic avatar | 118 // If we have a single local profile, then use the generic avatar |
179 // button instead of the profile name. Never use the generic button if | 119 // button instead of the profile name. Never use the generic button if |
180 // the active profile is Guest. | 120 // the active profile is Guest. |
181 const bool use_generic_button = | 121 const bool use_generic_button = |
182 !profile_->IsGuestSession() && | 122 !profile_->IsGuestSession() && storage.GetNumberOfProfiles() == 1 && |
183 storage.GetNumberOfProfiles() == 1 && | 123 !SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated(); |
184 !storage.GetAllProfilesAttributes().front()->IsAuthenticated(); | |
185 | 124 |
125 UpdateButton(use_generic_button, profile_, &error_controller_); | |
126 | |
127 PreferredSizeChanged(); | |
128 delegate_->ButtonPreferredSizeChanged(); | |
129 } | |
130 | |
131 void AvatarButton::UpdateButton(bool use_generic_button, | |
132 Profile* profile, | |
133 AvatarButtonErrorController* error_controller) { | |
186 SetText(use_generic_button | 134 SetText(use_generic_button |
187 ? base::string16() | 135 ? base::string16() |
188 : profiles::GetAvatarButtonTextForProfile(profile_)); | 136 : profiles::GetAvatarButtonTextForProfile(profile)); |
189 | 137 |
190 // If the button has no text, clear the text shadows to make sure the | 138 // If the button has no text, clear the text shadows to make sure the |
191 // image is centered correctly. | 139 // image is centered correctly. |
192 SetTextShadows( | 140 SetTextShadows( |
193 use_generic_button | 141 use_generic_button |
194 ? gfx::ShadowValues() | 142 ? gfx::ShadowValues() |
195 : gfx::ShadowValues( | 143 : gfx::ShadowValues( |
196 10, gfx::ShadowValue(gfx::Vector2d(), 2.0f, SK_ColorDKGRAY))); | 144 10, gfx::ShadowValue(gfx::Vector2d(), 2.0f, SK_ColorDKGRAY))); |
197 | 145 |
198 // We want the button to resize if the new text is shorter. | 146 // We want the button to resize if the new text is shorter. |
199 SetMinSize(gfx::Size()); | 147 SetMinSize(gfx::Size()); |
200 | 148 |
201 if (use_generic_button) { | 149 if (use_generic_button) { |
202 SetImage(views::Button::STATE_NORMAL, generic_avatar_); | 150 SetImage(views::Button::STATE_NORMAL, generic_avatar_); |
203 } else if (error_controller_.HasAvatarError()) { | 151 } else if (error_controller->HasAvatarError()) { |
204 SetImage(views::Button::STATE_NORMAL, | 152 SetImage(views::Button::STATE_NORMAL, |
205 gfx::CreateVectorIcon(kSyncProblemIcon, 16, gfx::kGoogleRed700)); | 153 gfx::CreateVectorIcon(kSyncProblemIcon, 16, gfx::kGoogleRed700)); |
206 } else { | 154 } else { |
207 SetImage(views::Button::STATE_NORMAL, gfx::ImageSkia()); | 155 SetImage(views::Button::STATE_NORMAL, gfx::ImageSkia()); |
208 } | 156 } |
209 | 157 |
210 // If we are not using the generic button, then reset the spacing between | 158 // If we are not using the generic button, then reset the spacing between |
211 // the text and the possible authentication error icon. | 159 // the text and the possible authentication error icon. |
212 const int kDefaultImageTextSpacing = 5; | 160 const int kDefaultImageTextSpacing = 5; |
213 SetImageLabelSpacing(use_generic_button ? 0 : kDefaultImageTextSpacing); | 161 SetImageLabelSpacing(use_generic_button ? 0 : kDefaultImageTextSpacing); |
162 } | |
214 | 163 |
215 PreferredSizeChanged(); | 164 void AvatarButton::SetButtonFromIdr(const int button_idr) { |
msarda
2017/04/25 08:26:02
Maybe: SetButtonAvatar(const int avatar_idr)?
| |
216 delegate_->ButtonPreferredSizeChanged(); | 165 ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); |
166 generic_avatar_ = *rb->GetImageNamed(button_idr).ToImageSkia(); | |
217 } | 167 } |
168 | |
169 //----------------------------------------------------------------------- | |
170 //----------------------------------------------------------------------- | |
171 //----------------------------------------------------------------------- | |
172 | |
173 NewAvatarButton::NewAvatarButton(AvatarButtonDelegate* delegate, | |
174 AvatarButtonStyle button_style, | |
175 Profile* profile) | |
176 : AvatarButton(delegate, profile) { | |
177 if (button_style == AvatarButtonStyle::THEMED) { | |
178 const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_NORMAL); | |
179 const int kHoverImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_HOVER); | |
180 const int kPressedImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_PRESSED); | |
181 SetButtonFromIdr(IDR_AVATAR_THEMED_BUTTON_AVATAR); | |
182 SetBorder(CreateBorder(kNormalImageSet, kHoverImageSet, kPressedImageSet)); | |
183 #if defined(OS_WIN) | |
184 } else if (base::win::GetVersion() < base::win::VERSION_WIN8) { | |
185 const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_NORMAL); | |
186 const int kHoverImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_HOVER); | |
187 const int kPressedImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_PRESSED); | |
188 SetButtonFromIdr(IDR_AVATAR_GLASS_BUTTON_AVATAR); | |
189 SetBorder(CreateBorder(kNormalImageSet, kHoverImageSet, kPressedImageSet)); | |
190 #endif | |
191 } else { | |
192 const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_NATIVE_BUTTON_NORMAL); | |
193 const int kHoverImageSet[] = IMAGE_GRID(IDR_AVATAR_NATIVE_BUTTON_HOVER); | |
194 const int kPressedImageSet[] = IMAGE_GRID(IDR_AVATAR_NATIVE_BUTTON_PRESSED); | |
195 SetButtonFromIdr(IDR_AVATAR_NATIVE_BUTTON_AVATAR); | |
196 SetBorder(CreateBorder(kNormalImageSet, kHoverImageSet, kPressedImageSet)); | |
197 } | |
198 | |
199 Update(); | |
200 SchedulePaint(); | |
201 } | |
202 | |
203 NewAvatarButton::~NewAvatarButton() {} | |
204 | |
205 gfx::Size NewAvatarButton::GetPreferredSize() const { | |
206 gfx::Size ps = views::MenuButton::GetPreferredSize(); | |
207 ps.set_height(kButtonNonMdHeight); | |
208 return ps; | |
209 } | |
210 | |
211 std::unique_ptr<views::Border> NewAvatarButton::CreateBorder( | |
212 const int normal_image_set[], | |
213 const int hot_image_set[], | |
214 const int pushed_image_set[]) const { | |
215 std::unique_ptr<views::LabelButtonAssetBorder> border( | |
216 new views::LabelButtonAssetBorder(views::Button::STYLE_TEXTBUTTON)); | |
217 | |
218 border->SetPainter(false, views::Button::STATE_NORMAL, | |
219 views::Painter::CreateImageGridPainter(normal_image_set)); | |
220 border->SetPainter(false, views::Button::STATE_HOVERED, | |
221 views::Painter::CreateImageGridPainter(hot_image_set)); | |
222 border->SetPainter(false, views::Button::STATE_PRESSED, | |
223 views::Painter::CreateImageGridPainter(pushed_image_set)); | |
224 | |
225 const int kLeftRightInset = 8; | |
226 const int kTopInset = 2; | |
227 const int kBottomInset = 4; | |
228 border->set_insets( | |
229 gfx::Insets(kTopInset, kLeftRightInset, kBottomInset, kLeftRightInset)); | |
230 | |
231 return std::move(border); | |
232 } | |
233 | |
234 //----------------------------------------------------------------------- | |
235 //----------------------------------------------------------------------- | |
236 //----------------------------------------------------------------------- | |
237 | |
238 MaterialDesignAvatarButton::MaterialDesignAvatarButton( | |
239 AvatarButtonDelegate* delegate, | |
240 Profile* profile, | |
241 BrowserView* browser_view) | |
242 : AvatarButton(delegate, profile), browser_view_(browser_view) { | |
243 DCHECK(browser_view); | |
244 | |
245 SetButtonFromIdr(IDR_AVATAR_MD_BUTTON_AVATAR); | |
246 SetBorder(CreateBorder()); | |
247 | |
248 Update(); | |
249 SchedulePaint(); | |
250 | |
251 SetInkDropMode(InkDropMode::ON); | |
252 set_has_ink_drop_action_on_click(true); | |
253 SetFocusPainter(nullptr); | |
254 set_ink_drop_base_color(SK_ColorBLACK); | |
255 set_ink_drop_visible_opacity(kRippleInkDropOpacity); | |
256 } | |
257 | |
258 MaterialDesignAvatarButton::~MaterialDesignAvatarButton() {} | |
259 | |
260 gfx::Size MaterialDesignAvatarButton::GetPreferredSize() const { | |
261 gfx::Size ps = views::MenuButton::GetPreferredSize(); | |
262 ps.set_width( | |
263 std::min(std::max(ps.width(), kMdButtonMinWidth), kMdButtonMaxWidth)); | |
264 ps.set_height(browser_view_->frame()->GetMinimizeButtonHeight()); | |
265 return ps; | |
266 } | |
267 | |
268 std::unique_ptr<views::Border> MaterialDesignAvatarButton::CreateBorder() | |
269 const { | |
270 std::unique_ptr<views::LabelButtonAssetBorder> border( | |
271 new views::LabelButtonAssetBorder(views::Button::STYLE_TEXTBUTTON)); | |
272 | |
273 const int kLeftRightInset = 8; | |
274 const int kTopInset = 1; // Tested at 100%, 125%, 150%, 175%, 200% scaling | |
275 const int kBottomInset = 3; | |
276 border->set_insets( | |
277 gfx::Insets(kTopInset, kLeftRightInset, kBottomInset, kLeftRightInset)); | |
278 | |
279 return std::move(border); | |
280 } | |
281 | |
282 std::unique_ptr<views::InkDrop> MaterialDesignAvatarButton::CreateInkDrop() { | |
283 return CreateDefaultFloodFillInkDropImpl(); | |
284 } | |
285 | |
286 std::unique_ptr<views::InkDropHighlight> | |
287 MaterialDesignAvatarButton::CreateInkDropHighlight() const { | |
288 auto center = gfx::RectF(gfx::Rect(size())).CenterPoint(); | |
289 auto ink_drop_highlight = base::MakeUnique<views::InkDropHighlight>( | |
290 size(), 0, center, GetInkDropBaseColor()); | |
291 ink_drop_highlight->set_visible_opacity(kHighlightInkDropOpacity); | |
292 return ink_drop_highlight; | |
293 } | |
294 | |
295 std::unique_ptr<views::InkDropRipple> | |
296 MaterialDesignAvatarButton::CreateInkDropRipple() const { | |
297 return base::MakeUnique<views::FloodFillInkDropRipple>( | |
298 size(), GetInkDropCenterBasedOnLastEvent(), GetInkDropBaseColor(), | |
299 ink_drop_visible_opacity()); | |
300 } | |
301 | |
302 void MaterialDesignAvatarButton::UpdateButtonHeightForPosition( | |
303 const int button_x, | |
304 int* button_height) const { | |
305 TabStrip* tab_strip = browser_view_->tabstrip(); | |
306 if (!tab_strip) | |
307 return; | |
308 | |
309 // In RTL the new tab button is on the left, so it can never slide under the | |
310 // avatar button (which is still on the right). May as well use the space. | |
311 if (base::i18n::IsRTL()) | |
312 return; | |
313 | |
314 // Use the "cozy" button if the tabstrip can slide under it | |
315 if (tab_strip->max_x() >= button_x) { | |
316 *button_height = kButtonMdCozyHeight; | |
317 } | |
318 } | |
OLD | NEW |