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 3d4897c00e3ca168aa31cdbe9775135cc22994d4..7ff9173cccd440ebaddd0655a7c1b790c4ccc70a 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() { |
!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::kContentsBackgroundColor); |
title_->set_background(views::Background::CreateSolidBackground( |
@@ -278,6 +276,7 @@ void AppListItemView::ItemNameChanged() { |
void AppListItemView::ItemHighlightedChanged() { |
apps_grid_view_->EnsureViewVisible(this); |
+ SetTitleSubpixelAA(); |
SchedulePaint(); |
} |
@@ -286,6 +285,7 @@ void AppListItemView::ItemIsInstallingChanged() { |
apps_grid_view_->EnsureViewVisible(this); |
title_->SetVisible(!item_->is_installing()); |
progress_bar_->SetVisible(item_->is_installing()); |
+ SetTitleSubpixelAA(); |
SchedulePaint(); |
} |
@@ -318,6 +318,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() + |
@@ -326,11 +327,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; |
@@ -391,7 +387,7 @@ void AppListItemView::StateChanged() { |
item_->SetHighlighted(false); |
title_->SetEnabledColor(kGridTitleColor); |
} |
- title_->Invalidate(); |
+ SetTitleSubpixelAA(); |
} |
bool AppListItemView::ShouldEnterPushedState(const ui::Event& event) { |