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

Unified Diff: ui/views/controls/styled_label.cc

Issue 19531006: requestAutocomplete: fix some text colors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: +PreferredSizeChanged override Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/styled_label.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/styled_label.cc
diff --git a/ui/views/controls/styled_label.cc b/ui/views/controls/styled_label.cc
index b821d4de3605849f58dd6bd084db3fa1e560f92e..d679ac13ee56edfa3f21208850174d6ea05d56b4 100644
--- a/ui/views/controls/styled_label.cc
+++ b/ui/views/controls/styled_label.cc
@@ -56,14 +56,12 @@ scoped_ptr<Label> CreateLabelRange(
} // namespace
-
StyledLabel::RangeStyleInfo::RangeStyleInfo()
: font_style(gfx::Font::NORMAL),
color(ui::NativeTheme::instance()->GetSystemColor(
ui::NativeTheme::kColorId_LabelEnabledColor)),
disable_line_wrapping(false),
- is_link(false) {
-}
+ is_link(false) {}
StyledLabel::RangeStyleInfo::~RangeStyleInfo() {}
@@ -72,7 +70,6 @@ StyledLabel::RangeStyleInfo StyledLabel::RangeStyleInfo::CreateForLink() {
RangeStyleInfo result;
result.disable_line_wrapping = true;
result.is_link = true;
- result.font_style = gfx::Font::UNDERLINE;
result.color = Link::GetDefaultEnabledColor();
return result;
}
@@ -93,7 +90,6 @@ StyledLabel::~StyledLabel() {}
void StyledLabel::SetText(const string16& text) {
text_ = text;
- calculated_size_ = gfx::Size();
style_ranges_ = std::priority_queue<StyleRange>();
RemoveAllChildViews(true);
PreferredSizeChanged();
@@ -107,7 +103,11 @@ void StyledLabel::AddStyleRange(const ui::Range& range,
style_ranges_.push(StyleRange(range, style_info));
- calculated_size_ = gfx::Size();
+ PreferredSizeChanged();
+}
+
+void StyledLabel::SetDefaultStyle(const RangeStyleInfo& style_info) {
+ default_style_info_ = style_info;
PreferredSizeChanged();
}
@@ -134,6 +134,11 @@ void StyledLabel::Layout() {
CalculateAndDoLayout(GetLocalBounds().width(), false);
}
+void StyledLabel::PreferredSizeChanged() {
+ calculated_size_ = gfx::Size();
+ View::PreferredSizeChanged();
+}
+
void StyledLabel::LinkClicked(Link* source, int event_flags) {
if (listener_)
listener_->StyledLabelLinkClicked(link_targets_[source], event_flags);
@@ -236,7 +241,7 @@ int StyledLabel::CalculateAndDoLayout(int width, bool dry_run) {
// This chunk is normal text.
if (position + chunk.size() > range.start())
chunk = chunk.substr(0, range.start() - position);
- label = CreateLabelRange(chunk, RangeStyleInfo(), this);
+ label = CreateLabelRange(chunk, default_style_info_, this);
}
if (displayed_on_background_color_set_)
« no previous file with comments | « ui/views/controls/styled_label.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698