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

Side by Side Diff: ui/views/controls/button/md_text_button.cc

Issue 2639203007: Update SetPaintToLayer to accept LayerType (Closed)
Patch Set: fix comments Created 3 years, 10 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/controls/button/md_text_button.h" 5 #include "ui/views/controls/button/md_text_button.h"
6 6
7 #include "base/i18n/case_conversion.h" 7 #include "base/i18n/case_conversion.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "ui/base/material_design/material_design_controller.h" 9 #include "ui/base/material_design/material_design_controller.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 SetMinSize(gfx::Size(kMinWidth, 0)); 198 SetMinSize(gfx::Size(kMinWidth, 0));
199 SetFocusPainter(nullptr); 199 SetFocusPainter(nullptr);
200 label()->SetAutoColorReadabilityEnabled(false); 200 label()->SetAutoColorReadabilityEnabled(false);
201 set_request_focus_on_press(false); 201 set_request_focus_on_press(false);
202 LabelButton::SetFontList(GetMdFontList()); 202 LabelButton::SetFontList(GetMdFontList());
203 203
204 set_animate_on_state_change(true); 204 set_animate_on_state_change(true);
205 205
206 // Paint to a layer so that the canvas is snapped to pixel boundaries (useful 206 // Paint to a layer so that the canvas is snapped to pixel boundaries (useful
207 // for fractional DSF). 207 // for fractional DSF).
208 SetPaintToLayer(true); 208 SetPaintToLayer();
209 layer()->SetFillsBoundsOpaquely(false); 209 layer()->SetFillsBoundsOpaquely(false);
210 } 210 }
211 211
212 void MdTextButton::UpdatePadding() { 212 void MdTextButton::UpdatePadding() {
213 // Don't use font-based padding when there's no text visible. 213 // Don't use font-based padding when there's no text visible.
214 if (GetText().empty()) { 214 if (GetText().empty()) {
215 SetBorder(NullBorder()); 215 SetBorder(NullBorder());
216 return; 216 return;
217 } 217 }
218 218
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 stroke_color, gfx::kDisabledControlAlpha); 297 stroke_color, gfx::kDisabledControlAlpha);
298 } 298 }
299 299
300 DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color))); 300 DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color)));
301 set_background(Background::CreateBackgroundPainter( 301 set_background(Background::CreateBackgroundPainter(
302 Painter::CreateRoundRectWith1PxBorderPainter(bg_color, stroke_color, 302 Painter::CreateRoundRectWith1PxBorderPainter(bg_color, stroke_color,
303 kInkDropSmallCornerRadius))); 303 kInkDropSmallCornerRadius)));
304 } 304 }
305 305
306 } // namespace views 306 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698