UI refinement for left/right ash tray and bubble.

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/audio/tray_volume.h"
@@ skipping 30 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
+namespace {
+
+// Adjust the size of SystemTrayContainer with additional padding.
+const int kTrayContainerVerticalPaddingBottomAlignment  = 1;
+const int kTrayContainerHorizontalPaddingBottomAlignment  = 1;
+const int kTrayContainerVerticalPaddingVerticalAlignment  = 1;
+const int kTrayContainerHorizontalPaddingVerticalAlignment = 2;
+
+}  // namespace
+
 namespace ash {
 
 namespace internal {
 
 // Container for all the items in the tray. The container auto-resizes the
 // widget when necessary.
 class SystemTrayContainer : public views::View {
  public:
   SystemTrayContainer() {}
   virtual ~SystemTrayContainer() {}
 
-  void SetLayoutManager(views::LayoutManager* layout_manager) {
-    views::View::SetLayoutManager(layout_manager);
+  void UpdateLayout(ShelfAlignment alignment) {
+    // Adjust the size of status tray dark background by adding additional
+    // empty border.
+    if (alignment == SHELF_ALIGNMENT_BOTTOM) {
+      set_border(views::Border::CreateEmptyBorder(
+          kTrayContainerVerticalPaddingBottomAlignment,
+          kTrayContainerHorizontalPaddingBottomAlignment,
+          kTrayContainerVerticalPaddingBottomAlignment,
+          kTrayContainerHorizontalPaddingBottomAlignment));
+      views::View::SetLayoutManager(new views::BoxLayout(
+          views::BoxLayout::kHorizontal, 0, 0, 0));
+    } else {
+      set_border(views::Border::CreateEmptyBorder(
+          kTrayContainerVerticalPaddingVerticalAlignment,
+          kTrayContainerHorizontalPaddingVerticalAlignment,
+          kTrayContainerVerticalPaddingVerticalAlignment,
+          kTrayContainerHorizontalPaddingVerticalAlignment));
+      views::View::SetLayoutManager(new views::BoxLayout(
+          views::BoxLayout::kVertical, 0, 0, 0));
+    }
     PreferredSizeChanged();
   }
 
  private:
   // Overridden from views::View.
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE {
     PreferredSizeChanged();
   }
 
   virtual void ChildVisibilityChanged(View* child) OVERRIDE {
@@ skipping 53 matching lines @@
       drive_observer_(NULL),
       ime_observer_(NULL),
       locale_observer_(NULL),
       network_observer_(NULL),
       update_observer_(NULL),
       user_observer_(NULL),
       should_show_launcher_(false),
       default_bubble_height_(0),
       hide_notifications_(false) {
   tray_container_ = new internal::SystemTrayContainer;
-  tray_container_->SetLayoutManager(new views::BoxLayout(
-      views::BoxLayout::kHorizontal, 0, 0, 0));
-  tray_container_->set_border(
-      views::Border::CreateEmptyBorder(1, 1, 1, 1));
+  tray_container_->UpdateLayout(shelf_alignment());
   SetContents(tray_container_);
   SetBorder();
 }
 
 SystemTray::~SystemTray() {
   bubble_.reset();
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
        it != items_.end();
        ++it) {
     (*it)->DestroyTrayView();
@@ skipping 329 matching lines @@
 }
 
 void SystemTray::SetBorder() {
   // Change the border padding for different shelf alignment.
   if (shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
     set_border(views::Border::CreateEmptyBorder(0, 0,
         kPaddingFromBottomOfScreenBottomAlignment,
         kPaddingFromRightEdgeOfScreenBottomAlignment));
   } else if (shelf_alignment() == SHELF_ALIGNMENT_LEFT) {
     set_border(views::Border::CreateEmptyBorder(0,
-        kPaddingFromEdgeOfScreenVerticalAlignment,
+        kPaddingFromOuterEdgeOfLauncherVerticalAlignment,
         kPaddingFromBottomOfScreenVerticalAlignment,
-        kPaddingFromEdgeOfLauncherVerticalAlignment));
+        kPaddingFromInnerEdgeOfLauncherVerticalAlignment));
   } else {
     set_border(views::Border::CreateEmptyBorder(0,
-        kPaddingFromEdgeOfLauncherVerticalAlignment,
+        kPaddingFromInnerEdgeOfLauncherVerticalAlignment,
         kPaddingFromBottomOfScreenVerticalAlignment,
-        kPaddingFromEdgeOfScreenVerticalAlignment));
+        kPaddingFromOuterEdgeOfLauncherVerticalAlignment));
   }
 }
 
 void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
   internal::TrayBackgroundView::SetShelfAlignment(alignment);
   UpdateAfterShelfAlignmentChange(alignment);
   SetBorder();
-  tray_container_->SetLayoutManager(new views::BoxLayout(
-      alignment == SHELF_ALIGNMENT_BOTTOM ?
-          views::BoxLayout::kHorizontal : views::BoxLayout::kVertical,
-      0, 0, 0));
+  tray_container_->UpdateLayout(alignment);
 }
 
 bool SystemTray::PerformAction(const views::Event& event) {
   // If we're already showing the default view, hide it; otherwise, show it
   // (and hide any popup that's currently shown).
   if (bubble_.get() &&
       bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DEFAULT) {
     bubble_->Close();
   } else {
     int arrow_offset = -1;
@@ skipping 35 matching lines @@
 
 void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) {
   // The tray itself expands to the right and bottom edge of the screen to make
   // sure clicking on the edges brings up the popup. However, the focus border
   // should be only around the container.
   if (GetWidget() && GetWidget()->IsActive())
     canvas->DrawFocusRect(tray_container_->bounds());
 }
 
 }  // namespace ash