Implement new volume mute button.

ash/system/tray/tray_views.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/tray_views.h"
 
 #include "ash/system/tray/tray_constants.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 const int kIconPaddingLeft = 5;
 const int kPaddingAroundButtons = 5;
 
+const int kBarImagesActive[] = {
+  IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_LEFT,
+  IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_CENTER,
+  IDR_AURA_UBER_TRAY_BAR_BUTTON_ACTIVE_RIGHT,
+};
+
+const int kBarImagesDisabled[] = {
+  IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_LEFT,
+  IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_CENTER,
+  IDR_AURA_UBER_TRAY_BAR_BUTTON_DISABLED_RIGHT,
+};
+
 views::View* CreatePopupHeaderButtonsContainer() {
   views::View* view = new views::View;
   view->SetLayoutManager(new
       views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, -1));
   view->set_border(views::Border::CreateEmptyBorder(0, 0, 0, 5));
   return view;
 }
 
 const int kBorderHeight = 3;
 const SkColor kBorderGradientDark = SkColorSetRGB(0xae, 0xae, 0xae);
@@ skipping 383 matching lines @@
     canvas->DrawRect(gfx::Rect(2, 1, width() - 4, height() - 3),
                      kFocusBorderColor);
   }
 }
 
 void TrayPopupHeaderButton::StateChanged() {
   SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// TrayBarButtonWithTitle
+
+class TrayBarButtonWithTitle::TrayBarButton
+  : public views::View {
+ public:
+  TrayBarButton(const int bar_active_images[], const int bar_disabled_images[])
+    : views::View(),
+      bar_active_images_(bar_active_images),
+      bar_disabled_images_(bar_disabled_images),
+      painter_(new views::HorizontalPainter(bar_active_images_)){
+  }
+  virtual ~TrayBarButton() {}
+
+  // Overriden from views::View
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+    painter_->Paint(canvas, size());
+  }
+
+  void Update(bool control_on) {
+    painter_.reset(new views::HorizontalPainter(
+        control_on ? bar_active_images_ : bar_disabled_images_));
+    SchedulePaint();
+  }
+
+ private:
+  const int* bar_active_images_;
+  const int* bar_disabled_images_;
+  scoped_ptr<views::HorizontalPainter> painter_;
+
+  DISALLOW_COPY_AND_ASSIGN(TrayBarButton);
+};
+
+TrayBarButtonWithTitle::TrayBarButtonWithTitle(views::ButtonListener* listener,
+                                               int title_id,
+                                               int width)
+    : views::CustomButton(listener),
+      image_(new TrayBarButton(kBarImagesActive, kBarImagesDisabled)),
+      title_(new views::Label),
+      width_(width) {
+  AddChildView(image_);
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  string16 text = rb.GetLocalizedString(title_id);
+  title_->SetText(text);
+  AddChildView(title_);
+
+  image_height_ = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+      kBarImagesActive[0]).ToImageSkia()->height();
+}
+
+TrayBarButtonWithTitle::~TrayBarButtonWithTitle() {}
+
+gfx::Size TrayBarButtonWithTitle::GetPreferredSize() {
+  return gfx::Size(width_, kTrayPopupItemHeight);
+}
+
+void TrayBarButtonWithTitle::Layout() {
+  gfx::Size title_size = title_->GetPreferredSize();
+  gfx::Rect rect(GetContentsBounds());
+  int bar_image_y = rect.height() / 2 - image_height_ / 2;
+  gfx::Rect bar_image_rect(rect.x(),
+                           bar_image_y,
+                           rect.width(),
+                           image_height_);
+  image_->SetBoundsRect(bar_image_rect);
+  // The image_ has some empty space below the bar image, move the title
+  // a little bit up to look closer to the bar.
+  title_->SetBounds(rect.x(),
+                    bar_image_y + image_height_ - 3,
+                    rect.width(),

[sadrul, 2012/07/23 21:02:30]

Instead of doing this, could there be a box-layout manager here (with negative
|between_child_spacing|)?

[jennyz, 2012/07/23 21:22:03]

It seems more flexible to control the layout by providing its own Layout
function here, it is similar to what boxlayout did, but easier to center the bar
image vertically  without padding the extra space with empty border.

+                    title_size.height());
+}
+
+void TrayBarButtonWithTitle::UpdateButton(bool control_on) {
+  image_->Update(control_on);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // SpecialPopupRow
 
 SpecialPopupRow::SpecialPopupRow()
     : content_(NULL),
       button_container_(NULL) {
   views::Background* background = views::Background::CreateBackgroundPainter(
       true, views::Painter::CreateVerticalGradient(kHeaderBackgroundColorLight,
                                                    kHeaderBackgroundColorDark));
   background->SetNativeControlColor(kHeaderBackgroundColorDark);
   set_background(background);
@@ skipping 76 matching lines @@
   label->SetAutoColorReadabilityEnabled(false);
   label->SetEnabledColor(SK_ColorWHITE);
   label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));
   label->SetShadowColors(SkColorSetARGB(64, 0, 0, 0),
                          SkColorSetARGB(64, 0, 0, 0));
   label->SetShadowOffset(0, 1);
 }
 
 }  // namespace internal
 }  // namespace ash