ash uber tray: Make the tray background rounded.

ash/system/tray/system_tray.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 "ash/system/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/user/login_status.h"
 #include "ash/wm/shadow_types.h"
 #include "base/logging.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 namespace internal {
 
 const int kArrowHeight = 10;
 const int kArrowWidth = 20;
 const int kArrowPaddingFromRight = 20;
 
 const int kShadowOffset = 3;
 const int kShadowHeight = 3;
 
 const SkColor kDarkColor = SkColorSetRGB(120, 120, 120);
 const SkColor kLightColor = SkColorSetRGB(240, 240, 240);
 const SkColor kBackgroundColor = SK_ColorWHITE;
 const SkColor kShadowColor = SkColorSetARGB(25, 0, 0, 0);
 
+const SkColor kTrayBackgroundColor = SkColorSetARGB(100, 0, 0, 0);
+const SkColor kTrayBackgroundHover = SkColorSetARGB(150, 0, 0, 0);
+
 class SystemTrayBubbleBackground : public views::Background {
  public:
   explicit SystemTrayBubbleBackground(views::View* owner)
       : owner_(owner) {
   }
 
   virtual ~SystemTrayBubbleBackground() {}
 
  private:
   // Overridden from views::Background.
@@ skipping 168 matching lines @@
   ash::SystemTray* tray_;
   std::vector<ash::SystemTrayItem*> items_;
   bool detailed_;
 
   int autoclose_delay_;
   base::OneShotTimer<SystemTrayBubble> autoclose_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble);
 };
 
+class SystemTrayBackground : public views::Background {
+ public:
+  SystemTrayBackground() : hovering_(false) {}
+  virtual ~SystemTrayBackground() {}
+
+  void set_hovering(bool hover) { hovering_ = hover; }
+
+ private:
+  // Overrridden from views::Background.

[Ben Goodger (Google), 2012/03/05 22:54:37]

2 rs

[sadrul, 2012/03/05 22:58:43]

Done.

+  virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
+    SkPaint paint;
+    paint.setAntiAlias(true);
+    paint.setStyle(SkPaint::kFill_Style);
+    paint.setColor(hovering_ ? kTrayBackgroundHover : kTrayBackgroundColor);
+    SkPath path;
+    gfx::Rect bounds(view->GetContentsBounds());
+    SkScalar radius = SkIntToScalar(4);
+    path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
+    canvas->GetSkCanvas()->drawPath(path, paint);
+  }
+
+  bool hovering_;
+
+  DISALLOW_COPY_AND_ASSIGN(SystemTrayBackground);
+};
+
 }  // namespace internal
 
 SystemTray::SystemTray()
     : items_(),
       bubble_(NULL),
       popup_(NULL) {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
       5, 0, 3));
-  set_background(views::Background::CreateSolidBackground(
-      SkColorSetARGB(127, 0, 0, 0)));
+  set_background(new SystemTrayBackground);
+  set_notify_enter_exit_on_child(true);
 }
 
 SystemTray::~SystemTray() {
   if (popup_)
     popup_->CloseNow();
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
       it != items_.end();
       ++it) {
     (*it)->DestroyTrayView();
   }
@@ skipping 61 matching lines @@
 }
 
 bool SystemTray::OnMousePressed(const views::MouseEvent& event) {
   if (popup_)
     popup_->Show();
   else
     ShowItems(items_, false);
   return true;
 }
 
+void SystemTray::OnMouseEntered(const views::MouseEvent& event) {
+  static_cast<SystemTrayBackground*>(background())->set_hovering(true);
+  SchedulePaint();
+}
+
+void SystemTray::OnMouseExited(const views::MouseEvent& event) {
+  static_cast<SystemTrayBackground*>(background())->set_hovering(false);
+  SchedulePaint();
+}
+
 void SystemTray::OnWidgetClosing(views::Widget* widget) {
   CHECK_EQ(popup_, widget);
   popup_ = NULL;
   bubble_ = NULL;
 }
 
 }  // namespace ash