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

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

Issue 2256403002: Adjust MdTextButton border calculation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | ui/views/controls/button/md_text_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 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 #ifndef UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/optional.h" 10 #include "base/optional.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 void UpdateStyleToIndicateDefaultStatus() override; 58 void UpdateStyleToIndicateDefaultStatus() override;
59 59
60 protected: 60 protected:
61 // LabelButton: 61 // LabelButton:
62 void SetFontList(const gfx::FontList& font_list) override; 62 void SetFontList(const gfx::FontList& font_list) override;
63 63
64 private: 64 private:
65 MdTextButton(ButtonListener* listener); 65 MdTextButton(ButtonListener* listener);
66 ~MdTextButton() override; 66 ~MdTextButton() override;
67 67
68 void UpdatePaddingForFont(); 68 void UpdatePadding();
69 void UpdateColors(); 69 void UpdateColors();
70 70
71 // The MD-style focus ring. This is not done via a FocusPainter 71 // The MD-style focus ring. This is not done via a FocusPainter
72 // because it needs to paint to a layer so it can extend beyond the bounds of 72 // because it needs to paint to a layer so it can extend beyond the bounds of
73 // |this|. 73 // |this|.
74 internal::MdFocusRing* focus_ring_; 74 internal::MdFocusRing* focus_ring_;
75 75
76 // True if this button uses call-to-action styling. 76 // True if this button uses call-to-action styling.
77 bool is_cta_; 77 bool is_cta_;
78 78
79 // When set, this provides the background color. 79 // When set, this provides the background color.
80 base::Optional<SkColor> bg_color_override_; 80 base::Optional<SkColor> bg_color_override_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(MdTextButton); 82 DISALLOW_COPY_AND_ASSIGN(MdTextButton);
83 }; 83 };
84 84
85 } // namespace views 85 } // namespace views
86 86
87 #endif // UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_ 87 #endif // UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/controls/button/md_text_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698