Improved appearance of app list folders.

ui/app_list/folder_image_source.cc

 // Copyright 2014 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/folder_image_source.h"
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 70 matching lines @@
                        resized.width(),
                        resized.height(),
                        x,
                        y,
                        resized.width(),
                        resized.height(),
                        true);
 }
 
 void FolderImageSource::Draw(gfx::Canvas* canvas) {
-  // Draw folder circle.
-  gfx::Point center = gfx::Point(size().width() / 2, size().height() / 2);
+  // Draw folder circles.
+  // Shadow.

[calamity, 2014/10/28 06:30:17]

// Draw circle for folder shadow.

[Matt Giuca, 2014/10/28 07:55:13]

Done.

+  gfx::PointF center(size().width() / 2, size().height() / 2);
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setAntiAlias(true);
+  paint.setColor(kFolderShadowColor);
+  canvas->sk_canvas()->drawCircle(
+      center.x(), center.y(), kFolderShadowRadius, paint);
+  // Bubble.

[calamity, 2014/10/28 06:30:17]

// Draw circle for folder bubble.

(Is bubble the right term?)

[Matt Giuca, 2014/10/28 07:55:13]

Well it was used before (kFolderBubbleColor) so I guess it's as good as any.

+  center = gfx::PointF(size().width() / 2,
+                       size().height() / 2 - kFolderShadowOffsetY);

[calamity, 2014/10/28 06:30:17]

gfx::PointF bubble_center? Then use center.x()/y().

[Matt Giuca, 2014/10/28 07:55:13]

Done.

   paint.setColor(kFolderBubbleColor);
-  canvas->DrawCircle(center, size().width() / 2, paint);
+  canvas->sk_canvas()->drawCircle(
+      center.x(), center.y(), kFolderBubbleRadius, paint);
 
   if (icons_.size() == 0)
     return;
 
   // Draw top items' icons.
   const gfx::Size item_icon_size(ItemIconSize());
   std::vector<gfx::Rect> top_icon_bounds = GetTopIconsBounds(gfx::Rect(size()));
 
   for (size_t i = 0; i < kNumFolderTopItems && i < icons_.size(); ++i) {
     DrawIcon(canvas,
              icons_[i],
              item_icon_size,
              top_icon_bounds[i].x(),
              top_icon_bounds[i].y());
   }
 }
 
 }  // namespace app_list