app_list: Update colors and sizes for v2.

ui/app_list/app_list_item_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/app_list_item_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 36 matching lines @@
 
 // FontSize/IconSize ratio = 24 / 128, which means we should get 24 font size
 // when icon size is 128.
 const float kFontSizeToIconSizeRatio = 0.1875f;
 
 // Font smaller than kBoldFontSize needs to be bold.
 const int kBoldFontSize = 14;
 
 const int kMinFontSize = 12;
 
+const int kFixedFontSize = 11;  // Font size for fixed layout.
+
 const int kMinTitleChars = 15;
 
 const int kLeftRightPaddingChars = 1;
 
-const gfx::Font& GetTitleFontForIconSize(const gfx::Size& size) {
+const gfx::Font& GetTitleFontForIconSize(const gfx::Size& size, bool fixed) {
   static int icon_height;
   static gfx::Font* font = NULL;
 
-  if (font && icon_height == size.height())
+  // Reuses current font for fixed layout or icon height is the same.
+  if (font && (fixed || icon_height == size.height()))
     return *font;
 
   delete font;
 
   icon_height = size.height();
-  int font_size = std::max(
-      static_cast<int>(icon_height * kFontSizeToIconSizeRatio),
-      kMinFontSize);
+  int font_size = fixed ? kFixedFontSize :
+      std::max(static_cast<int>(icon_height * kFontSizeToIconSizeRatio),
+               kMinFontSize);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::Font title_font(rb.GetFont(ui::ResourceBundle::BaseFont).GetFontName(),
                        font_size);
   if (font_size <= kBoldFontSize)
     title_font = title_font.DeriveFont(0, gfx::Font::BOLD);
   font = new gfx::Font(title_font);
   return *font;
 }
 
@@ skipping 137 matching lines @@
 
 // static
 gfx::Size AppListItemView::GetPreferredSizeForIconSize(
     const gfx::Size& icon_size) {
   int min_title_width = g_min_title_width;
   // Fixed 20px is used for left/right padding before switching to padding
   // based on number of chars. It is also a number used for test case
   // AppList.ModelViewCalculateLayout.
   int left_right_padding = 20;
   if (min_title_width == 0) {
-    const gfx::Font& title_font = GetTitleFontForIconSize(icon_size);
+    // Assumes fixed layout is false since this function should only be called
+    // for dynamic layout.
+    const gfx::Font& title_font = GetTitleFontForIconSize(icon_size,
+                                                          false /* fixed */);
     // Use big char such as 'G' to calculate min title width.
     min_title_width = kMinTitleChars *
         title_font.GetStringWidth(ASCIIToUTF16("G"));
     left_right_padding = kLeftRightPaddingChars *
         title_font.GetAverageCharacterWidth();
   }
 
   int dimension = std::max(icon_size.width() * 2, min_title_width);
   gfx::Size size(dimension, dimension);
   size.Enlarge(left_right_padding, kTopBottomPadding);
   return size;
 }
 
 // static
 void AppListItemView::SetMinTitleWidth(int width) {
   g_min_title_width = width;
 }
 
 void AppListItemView::SetIconSize(const gfx::Size& size) {
   if (icon_size_ == size)
     return;
 
   icon_size_ = size;
-  title_->SetFont(GetTitleFontForIconSize(size));
+  title_->SetFont(GetTitleFontForIconSize(size,
+                                          list_model_view_->fixed_layout()));
   UpdateIcon();
 }
 
 void AppListItemView::SetSelected(bool selected) {
   if (selected == selected_)
     return;
 
   RequestFocus();
   selected_ = selected;
   SchedulePaint();
@@ skipping 72 matching lines @@
   int left_right_padding = kLeftRightPaddingChars *
       title_->font().GetAverageCharacterWidth();
   rect.Inset(left_right_padding, kTopBottomPadding);
 
   gfx::Size title_size = title_->GetPreferredSize();
   int height = icon_size_.height() + kIconTitleSpacing +
       title_size.height();
   int y = rect.y() + (rect.height() - height) / 2;
 
   gfx::Rect icon_bounds(rect.x(), y, rect.width(), icon_size_.height());
-  icon_bounds.Inset(0, -IconOperation::kShadowPadding);
+  icon_bounds.Inset(-IconOperation::kShadowPadding,
+                    -IconOperation::kShadowPadding);
   icon_->SetBoundsRect(icon_bounds);
 
   title_->SetBounds(rect.x(),
                     y + icon_size_.height() + kIconTitleSpacing,
                     rect.width(),
                     title_size.height());
 }
 
 void AppListItemView::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect rect(GetContentsBounds());
@@ skipping 36 matching lines @@
 void AppListItemView::StateChanged() {
   if (state() == BS_HOT || state() == BS_PUSHED) {
     list_model_view_->SetSelectedItem(this);
   } else {
     list_model_view_->ClearSelectedItem(this);
     model_->SetHighlighted(false);
   }
 }
 
 }  // namespace app_list