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

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

Issue 371633002: LabelButton: cache the last computed preferred size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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 | « ui/views/button_drag_utils.cc ('k') | ui/views/controls/button/label_button.h » ('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/controls/button/checkbox.h" 5 #include "ui/views/controls/button/checkbox.h"
6 6
7 #include "grit/ui_resources.h" 7 #include "grit/ui_resources.h"
8 #include "ui/accessibility/ax_view_state.h" 8 #include "ui/accessibility/ax_view_state.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/views/controls/button/label_button_border.h" 10 #include "ui/views/controls/button/label_button_border.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // Checked/Focused images. 60 // Checked/Focused images.
61 SetCustomImage(true, true, STATE_NORMAL, 61 SetCustomImage(true, true, STATE_NORMAL,
62 *rb.GetImageSkiaNamed(IDR_CHECKBOX_FOCUSED_CHECKED)); 62 *rb.GetImageSkiaNamed(IDR_CHECKBOX_FOCUSED_CHECKED));
63 SetCustomImage(true, true, STATE_HOVERED, 63 SetCustomImage(true, true, STATE_HOVERED,
64 *rb.GetImageSkiaNamed(IDR_CHECKBOX_FOCUSED_CHECKED_HOVER)); 64 *rb.GetImageSkiaNamed(IDR_CHECKBOX_FOCUSED_CHECKED_HOVER));
65 SetCustomImage(true, true, STATE_PRESSED, 65 SetCustomImage(true, true, STATE_PRESSED,
66 *rb.GetImageSkiaNamed(IDR_CHECKBOX_FOCUSED_CHECKED_PRESSED)); 66 *rb.GetImageSkiaNamed(IDR_CHECKBOX_FOCUSED_CHECKED_PRESSED));
67 67
68 // Limit the checkbox height to match the legacy appearance. 68 // Limit the checkbox height to match the legacy appearance.
69 const gfx::Size preferred_size(LabelButton::GetPreferredSize()); 69 const gfx::Size preferred_size(LabelButton::GetPreferredSize());
70 set_min_size(gfx::Size(0, preferred_size.height() + 4)); 70 SetMinSize(gfx::Size(0, preferred_size.height() + 4));
71 } 71 }
72 72
73 Checkbox::~Checkbox() { 73 Checkbox::~Checkbox() {
74 } 74 }
75 75
76 void Checkbox::SetChecked(bool checked) { 76 void Checkbox::SetChecked(bool checked) {
77 checked_ = checked; 77 checked_ = checked;
78 UpdateImage(); 78 UpdateImage();
79 } 79 }
80 80
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 ui::NativeTheme::Part Checkbox::GetThemePart() const { 138 ui::NativeTheme::Part Checkbox::GetThemePart() const {
139 return ui::NativeTheme::kCheckbox; 139 return ui::NativeTheme::kCheckbox;
140 } 140 }
141 141
142 void Checkbox::GetExtraParams(ui::NativeTheme::ExtraParams* params) const { 142 void Checkbox::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
143 LabelButton::GetExtraParams(params); 143 LabelButton::GetExtraParams(params);
144 params->button.checked = checked_; 144 params->button.checked = checked_;
145 } 145 }
146 146
147 } // namespace views 147 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/button_drag_utils.cc ('k') | ui/views/controls/button/label_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698