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

Side by Side Diff: views/controls/label.cc

Issue 6976048: views: Add OnEnabledChanged() method to View class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/controls/label.h" 5 #include "views/controls/label.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 if (!is_multi_line_) 199 if (!is_multi_line_)
200 return View::GetHeightForWidth(w); 200 return View::GetHeightForWidth(w);
201 201
202 w = std::max(0, w - GetInsets().width()); 202 w = std::max(0, w - GetInsets().width());
203 int h = font_.GetHeight(); 203 int h = font_.GetHeight();
204 gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h, 204 gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h,
205 ComputeMultiLineFlags()); 205 ComputeMultiLineFlags());
206 return h + GetInsets().height(); 206 return h + GetInsets().height();
207 } 207 }
208 208
209 void Label::SetEnabled(bool enabled) { 209 void Label::OnEnabledChanged(bool enabled) {
210 if (enabled == enabled_) 210 if (enabled == enabled_)
211 return; 211 return;
212 View::SetEnabled(enabled); 212 View::SetEnabled(enabled);
Ben Goodger (Google) 2011/05/27 16:01:21 Infinite recursion.
tfarina 2011/05/27 16:25:04 Done.
213 SetColor(enabled ? kEnabledColor : kDisabledColor); 213 SetColor(enabled ? kEnabledColor : kDisabledColor);
214 } 214 }
215 215
216 std::string Label::GetClassName() const { 216 std::string Label::GetClassName() const {
217 return kViewClassName; 217 return kViewClassName;
218 } 218 }
219 219
220 void Label::OnMouseMoved(const MouseEvent& event) { 220 void Label::OnMouseMoved(const MouseEvent& event) {
221 UpdateContainsMouse(event); 221 UpdateContainsMouse(event);
222 } 222 }
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 font_, GetAvailableRect().width(), true)); 454 font_, GetAvailableRect().width(), true));
455 } else { 455 } else {
456 *paint_text = UTF16ToWideHack(text_); 456 *paint_text = UTF16ToWideHack(text_);
457 } 457 }
458 458
459 *text_bounds = GetTextBounds(); 459 *text_bounds = GetTextBounds();
460 *flags = ComputeMultiLineFlags(); 460 *flags = ComputeMultiLineFlags();
461 } 461 }
462 462
463 } // namespace views 463 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698