ash: Highlight the items in the uber-tray popup when hovering.

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/tray_constants.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 "ash/wm/window_animations.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/fill_layout.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 namespace {
 
 const int kPaddingFromRightEdgeOfScreen = 10;
 const int kPaddingFromBottomOfScreen = 10;
 
 const int kAnimationDurationForPopupMS = 200;
 
 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 kHoverBackgroundColor = SkColorSetRGB(0xfb, 0xfc, 0xfb);
 const SkColor kShadowColor = SkColorSetARGB(25, 0, 0, 0);
 
 const SkColor kTrayBackgroundColor = SkColorSetARGB(100, 0, 0, 0);
 const SkColor kTrayBackgroundHover = SkColorSetARGB(150, 0, 0, 0);
 
+// A view with some special behaviour for tray items:
+// - changes background color on hover.
+// - TODO: accessibility
+class TrayItemContainer : public views::View {
+ public:
+  explicit TrayItemContainer(views::View* view) : hover_(false) {
+    set_notify_enter_exit_on_child(true);
+    set_border(view->border() ? views::Border::CreateEmptyBorder(0, 0, 0, 0) :
+                                NULL);
+    SetLayoutManager(new views::FillLayout);
+    AddChildView(view);
+  }
+
+  views::View* view() { return child_at(0); }
+
+  virtual ~TrayItemContainer() {}

[Ben Goodger (Google), 2012/03/15 19:05:40]

put this below the ctor

[sadrul, 2012/03/15 19:11:08]

Done.

+
+ private:
+  // Overridden from views::View.
+  virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE {
+    hover_ = true;
+    SchedulePaint();
+  }
+
+  virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE {
+    hover_ = false;
+    SchedulePaint();
+  }
+
+  virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE {
+    views::View* view = child_at(0);
+    if (!view->background()) {
+      canvas->FillRect(gfx::Rect(size()),
+          hover_ ? kHoverBackgroundColor : kBackgroundColor);
+    } else {
+      canvas->FillRect(gfx::Rect(view->x() + kShadowOffset, view->y(),
+                                 view->width() - kShadowOffset, kShadowHeight),
+                       kShadowColor);
+    }
+  }
+
+  bool hover_;
+
+  DISALLOW_COPY_AND_ASSIGN(TrayItemContainer);
+};
+
 class SystemTrayBubbleBackground : public views::Background {
  public:
   explicit SystemTrayBubbleBackground(views::View* owner)
       : owner_(owner) {
   }
 
   virtual ~SystemTrayBubbleBackground() {}
 
  private:
   // Overridden from views::Background.
   virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
     views::View* last_view = NULL;
     for (int i = 0; i < owner_->child_count(); i++) {
       views::View* v = owner_->child_at(i);
 
-      if (!v->background()) {
-        canvas->FillRect(v->bounds(), kBackgroundColor);
-      } else if (last_view) {
-        canvas->FillRect(gfx::Rect(v->x() + kShadowOffset, v->y(),
-                                   v->width() - kShadowOffset, kShadowHeight),
-                         kShadowColor);
-      }
-
       if (!v->border()) {
         canvas->DrawLine(gfx::Point(v->x() - 1, v->y() - 1),
             gfx::Point(v->x() + v->width() + 1, v->y() - 1),
             !last_view || last_view->border() ? kDarkColor : kLightColor);
         canvas->DrawLine(gfx::Point(v->x() - 1, v->y() - 1),
             gfx::Point(v->x() - 1, v->y() + v->height() + 1),
             kDarkColor);
         canvas->DrawLine(gfx::Point(v->x() + v->width(), v->y() - 1),
             gfx::Point(v->x() + v->width(), v->y() + v->height() + 1),
             kDarkColor);
@@ skipping 152 matching lines @@
 
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     ash::user::LoginStatus login_status = delegate->GetUserLoginStatus();
     for (std::vector<ash::SystemTrayItem*>::iterator it = items_.begin();
         it != items_.end();
         ++it) {
       views::View* view = detailed_ ? (*it)->CreateDetailedView(login_status) :
                                       (*it)->CreateDefaultView(login_status);
       if (view)
-        AddChildView(view);
+        AddChildView(new TrayItemContainer(view));
     }
   }
 
   virtual bool CanActivate() const OVERRIDE {
     return can_activate_;
   }
 
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE {
     autoclose_.Stop();
   }
@@ skipping 178 matching lines @@
   SchedulePaint();
 }
 
 void SystemTray::OnWidgetClosing(views::Widget* widget) {
   CHECK_EQ(popup_, widget);
   popup_ = NULL;
   bubble_ = NULL;
 }
 
 }  // namespace ash