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

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

Issue 2244003002: Materialized font style for TrayItemMore type system tray rows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re-ordered static function in Label. Created 4 years, 3 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/controls/label.h ('k') | no next file » | 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/label.h" 5 #include "ui/views/controls/label.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <cmath> 10 #include <cmath>
(...skipping 10 matching lines...) Expand all
21 #include "ui/base/default_style.h" 21 #include "ui/base/default_style.h"
22 #include "ui/base/material_design/material_design_controller.h" 22 #include "ui/base/material_design/material_design_controller.h"
23 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
24 #include "ui/gfx/canvas.h" 24 #include "ui/gfx/canvas.h"
25 #include "ui/gfx/color_utils.h" 25 #include "ui/gfx/color_utils.h"
26 #include "ui/gfx/geometry/insets.h" 26 #include "ui/gfx/geometry/insets.h"
27 #include "ui/gfx/text_elider.h" 27 #include "ui/gfx/text_elider.h"
28 #include "ui/native_theme/native_theme.h" 28 #include "ui/native_theme/native_theme.h"
29 29
30 namespace views { 30 namespace views {
31 namespace {
32
33 const gfx::FontList& GetDefaultFontList() {
34 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
35 return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
36 }
37
38 } // namespace
39
40 // static 31 // static
41 const char Label::kViewClassName[] = "Label"; 32 const char Label::kViewClassName[] = "Label";
42 const int Label::kFocusBorderPadding = 1; 33 const int Label::kFocusBorderPadding = 1;
43 34
44 Label::Label() : Label(base::string16()) { 35 Label::Label() : Label(base::string16()) {
45 } 36 }
46 37
47 Label::Label(const base::string16& text) : Label(text, GetDefaultFontList()) { 38 Label::Label(const base::string16& text) : Label(text, GetDefaultFontList()) {
48 } 39 }
49 40
50 Label::Label(const base::string16& text, const gfx::FontList& font_list) { 41 Label::Label(const base::string16& text, const gfx::FontList& font_list) {
51 Init(text, font_list); 42 Init(text, font_list);
52 } 43 }
53 44
54 Label::~Label() { 45 Label::~Label() {
55 } 46 }
56 47
48 // static
49 const gfx::FontList& Label::GetDefaultFontList() {
50 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
51 return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
52 }
53
57 void Label::SetFontList(const gfx::FontList& font_list) { 54 void Label::SetFontList(const gfx::FontList& font_list) {
58 is_first_paint_text_ = true; 55 is_first_paint_text_ = true;
59 render_text_->SetFontList(font_list); 56 render_text_->SetFontList(font_list);
60 ResetLayout(); 57 ResetLayout();
61 } 58 }
62 59
63 void Label::SetText(const base::string16& new_text) { 60 void Label::SetText(const base::string16& new_text) {
64 if (new_text == text()) 61 if (new_text == text())
65 return; 62 return;
66 is_first_paint_text_ = true; 63 is_first_paint_text_ = true;
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 } 603 }
607 604
608 bool Label::ShouldShowDefaultTooltip() const { 605 bool Label::ShouldShowDefaultTooltip() const {
609 const gfx::Size text_size = GetTextSize(); 606 const gfx::Size text_size = GetTextSize();
610 const gfx::Size size = GetContentsBounds().size(); 607 const gfx::Size size = GetContentsBounds().size();
611 return !obscured() && (text_size.width() > size.width() || 608 return !obscured() && (text_size.width() > size.width() ||
612 (multi_line() && text_size.height() > size.height())); 609 (multi_line() && text_size.height() > size.height()));
613 } 610 }
614 611
615 } // namespace views 612 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/label.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698