Index: ui/app_list/views/app_list_item_view.cc |
diff --git a/ui/app_list/views/app_list_item_view.cc b/ui/app_list/views/app_list_item_view.cc |
index 74b487dfd064164aebae3dd05b3d0aabbe5156da..a4107c1cd1864a3a91706d6baa8be0cb3d1bfa6e 100644 |
--- a/ui/app_list/views/app_list_item_view.cc |
+++ b/ui/app_list/views/app_list_item_view.cc |
@@ -187,6 +187,7 @@ void AppListItemView::SetUIState(UIState state) { |
} |
#endif // !OS_WIN |
+ SetTitleSubpixelAA(); |
SchedulePaint(); |
} |
@@ -211,10 +212,7 @@ void AppListItemView::SetTitleSubpixelAA() { |
!is_highlighted_ && !apps_grid_view_->IsSelectedView(this) && |
!apps_grid_view_->IsAnimatingView(this); |
- bool currently_enabled = title_->background() != NULL; |
- if (currently_enabled == enable_aa) |
- return; |
- |
+ title_->SetSubpixelRenderingEnabled(enable_aa); |
if (enable_aa) { |
title_->SetBackgroundColor(app_list::kLabelBackgroundColor); |
title_->set_background(views::Background::CreateSolidBackground( |
@@ -276,6 +274,7 @@ void AppListItemView::SetItemName(const base::string16& display_name, |
void AppListItemView::SetItemIsHighlighted(bool is_highlighted) { |
is_highlighted_ = is_highlighted; |
+ SetTitleSubpixelAA(); |
SchedulePaint(); |
} |
@@ -285,6 +284,7 @@ void AppListItemView::SetItemIsInstalling(bool is_installing) { |
title_->SetVisible(!is_installing); |
progress_bar_->SetVisible(is_installing); |
} |
+ SetTitleSubpixelAA(); |
SchedulePaint(); |
} |
@@ -331,6 +331,7 @@ void AppListItemView::Layout() { |
title_size.height()); |
title_bounds.Intersect(rect); |
title_->SetBoundsRect(title_bounds); |
+ SetTitleSubpixelAA(); |
gfx::Rect progress_bar_bounds(progress_bar_->GetPreferredSize()); |
progress_bar_bounds.set_x(GetContentsBounds().x() + |
@@ -339,11 +340,6 @@ void AppListItemView::Layout() { |
progress_bar_->SetBoundsRect(progress_bar_bounds); |
} |
-void AppListItemView::SchedulePaintInRect(const gfx::Rect& r) { |
- SetTitleSubpixelAA(); |
- views::CustomButton::SchedulePaintInRect(r); |
-} |
- |
void AppListItemView::OnPaint(gfx::Canvas* canvas) { |
if (apps_grid_view_->IsDraggedView(this)) |
return; |
@@ -405,7 +401,7 @@ void AppListItemView::StateChanged() { |
item_weak_->set_highlighted(false); |
title_->SetEnabledColor(kGridTitleColor); |
} |
- title_->Invalidate(); |
+ SetTitleSubpixelAA(); |
} |
bool AppListItemView::ShouldEnterPushedState(const ui::Event& event) { |