Views: Custom drawing for GAIA avatar pictures

chrome/browser/ui/views/avatar_menu_bubble_view.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
+#include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "views/controls/button/custom_button.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/separator.h"
 
 namespace {
 
 // TODO(msw): Get color from theme/window color.
 const SkColor kColor = SK_ColorWHITE;
 
 const int kItemHeight = 44;
 const int kItemMarginY = 4;
-const int kIconWidth = 38;
 const int kIconMarginX = 6;
 const int kSeparatorPaddingY = 5;
 
 inline int Round(double x) {
   return static_cast<int>(x + 0.5);
 }
 
 gfx::Rect GetCenteredAndScaledRect(int src_width, int src_height,
                                    int dst_x, int dst_y,
                                    int dst_width, int dst_height) {
@@ skipping 171 matching lines @@
   edit_link_->SetHasFocusBorder(true);
   AddChildView(edit_link_);
 
   OnHighlightStateChanged();
 }
 
 gfx::Size ProfileItemView::GetPreferredSize() {
   int width = std::max(name_label_->GetPreferredSize().width(),
                        sync_state_label_->GetPreferredSize().width());
   width = std::max(edit_link_->GetPreferredSize().width(), width);
-  return gfx::Size(kIconWidth + kIconMarginX + width, kItemHeight);
+  return gfx::Size(profiles::kAvatarIconWidth + kIconMarginX + width,
+                   kItemHeight);
 }
 
 void ProfileItemView::Layout() {
   // Profile icon.
-  const SkBitmap& icon = image_view_->GetImage();
-  gfx::Rect icon_rect = GetCenteredAndScaledRect(
-      icon.width(), icon.height(), 0, 0, kIconWidth, height());

[sail, 2011/11/26 06:59:04]

This old code had a bug in it. It assumed that the image_view just contained the
avatar icon and was the icon width and height.

For active profiles this was not the case. For active profiles the view
contained the avatar icon and the badge on the bottom corner. This mean that the
view was wider than the icon width.

This bug resulted in the image being scaled and blurry. To fix this I'm forcing
the code to use the image view's preferred size for the active profile. This is
safe since the we explicitly scale the avatar icon before badging it.

+  gfx::Rect icon_rect;
+  if (item_.active) {
+    // If this is the active item then the icon is already scaled and so
+    // just use the preferred size.
+    icon_rect.set_size(image_view_->GetPreferredSize());
+    icon_rect.set_y((height() - icon_rect.height()) / 2);
+  } else {
+    const SkBitmap& icon = image_view_->GetImage();
+    icon_rect = GetCenteredAndScaledRect(icon.width(), icon.height(), 0, 0,
+        profiles::kAvatarIconWidth, height());
+  }
   image_view_->SetBoundsRect(icon_rect);
 
-  int label_x = icon_rect.right() + kIconMarginX;
+  int label_x = profiles::kAvatarIconWidth + kIconMarginX;
   int max_label_width = std::max(width() - label_x, 0);
   gfx::Size name_size = name_label_->GetPreferredSize();
   name_size.set_width(std::min(name_size.width(), max_label_width));
   gfx::Size state_size = sync_state_label_->GetPreferredSize();
   state_size.set_width(std::min(state_size.width(), max_label_width));
   gfx::Size edit_size = edit_link_->GetPreferredSize();
   edit_size.set_width(std::min(edit_size.width(), max_label_width));
 
   const int kNameStatePaddingY = 2;
   int labels_height = name_size.height() + kNameStatePaddingY +
@@ skipping 40 matching lines @@
 }
 
 void ProfileItemView::OnFocusStateChanged(bool has_focus) {
   if (!has_focus && state() != views::CustomButton::BS_DISABLED)
     SetState(views::CustomButton::BS_NORMAL);
   OnHighlightStateChanged();
 }
 
 // static
 SkBitmap ProfileItemView::GetBadgedIcon(const SkBitmap& icon) {
-  gfx::Rect icon_rect = GetCenteredAndScaledRect(
-      icon.width(), icon.height(), 0, 0, kIconWidth, kItemHeight);
+  gfx::Rect icon_rect = GetCenteredAndScaledRect(icon.width(), icon.height(),
+      0, 0, profiles::kAvatarIconWidth, kItemHeight);
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SkBitmap badge = rb.GetImageNamed(IDR_PROFILE_SELECTED);
   const float kBadgeOverlapRatioX = 1.0f / 5.0f;
   int width = icon_rect.width() + badge.width() * kBadgeOverlapRatioX;
   const float kBadgeOverlapRatioY = 1.0f / 3.0f;
   int height = icon_rect.height() + badge.height() * kBadgeOverlapRatioY;
 
   gfx::CanvasSkia canvas(width, height, false);
   canvas.DrawBitmapInt(icon, 0, 0, icon.width(), icon.height(), 0, 0,
@@ skipping 42 matching lines @@
     gfx::Size size = item_views_[i]->GetPreferredSize();
     max_width = std::max(max_width, size.width());
     total_height += size.height() + kItemMarginY;
   }
 
   total_height += kSeparatorPaddingY * 2 +
                   separator_->GetPreferredSize().height();
 
   gfx::Size add_profile_size = add_profile_link_->GetPreferredSize();
   max_width = std::max(max_width,
-                       add_profile_size.width() +  kIconWidth + kIconMarginX);
+      add_profile_size.width() + profiles::kAvatarIconWidth + kIconMarginX);
   total_height += add_profile_link_->GetPreferredSize().height();
 
   const int kBubbleViewMaxWidth = 800;
   const int kBubbleViewMinWidth = 175;
   int total_width = std::min(std::max(max_width, kBubbleViewMinWidth),
                              kBubbleViewMaxWidth);
   return gfx::Size(total_width, total_height);
 }
 
 void AvatarMenuBubbleView::Layout() {
   int y = 0;
   for (size_t i = 0; i < item_views_.size(); ++i) {
     views::CustomButton* item_view = item_views_[i];
     int item_height = item_view->GetPreferredSize().height();
     int item_width = width();
     item_view->SetBounds(0, y, item_width, item_height);
     y += item_height + kItemMarginY;
   }
 
   y += kSeparatorPaddingY;
   int separator_height = separator_->GetPreferredSize().height();
   separator_->SetBounds(0, y, width(), separator_height);
   y += kSeparatorPaddingY + separator_height;
 
-  add_profile_link_->SetBounds(kIconWidth + kIconMarginX, y, width(),
-                               add_profile_link_->GetPreferredSize().height());
+  add_profile_link_->SetBounds(profiles::kAvatarIconWidth + kIconMarginX, y,
+      width(), add_profile_link_->GetPreferredSize().height());
 }
 
 bool AvatarMenuBubbleView::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   if (accelerator.key_code() != ui::VKEY_DOWN &&
       accelerator.key_code() != ui::VKEY_UP) {
     return false;
   }
 
   if (item_views_.empty())
@@ skipping 79 matching lines @@
 
   add_profile_link_ = new views::Link(
       l10n_util::GetStringUTF16(IDS_PROFILES_CREATE_NEW_PROFILE_LINK));
   add_profile_link_->set_listener(this);
   add_profile_link_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   add_profile_link_->SetEnabledColor(SkColorSetRGB(0xe3, 0xed, 0xf6));
   AddChildView(add_profile_link_);
 
   PreferredSizeChanged();
 }