ash:Shelf - Update position and hit box of status area.

ash/system/tray/tray_background_view.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_background_view.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 425 matching lines @@
 }
 
 void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
   shelf_alignment_ = alignment;
   SetBorder();
   tray_container_->SetAlignment(alignment);
 }
 
 void TrayBackgroundView::SetBorder() {
   views::View* parent = status_area_widget_->status_area_widget_delegate();
-
+  // Tray views are laid out right-to-left or bottom-to-top
+  int on_edge = (this == parent->child_at(0));

[James Cook, 2013/09/18 01:36:07]

int -> bool?

   if (ash::switches::UseAlternateShelfLayout()) {
-    set_border(views::Border::CreateEmptyBorder(
-        0,
-        0,
-        ShelfLayoutManager::kAutoHideSize,
-        0));
+    int inner_edge = ShelfLayoutManager::kShelfItemInset;
+    int outer_edge =
+        ShelfLayoutManager::GetPreferredShelfSize() - inner_edge -
+        GetShelfItemHeight();
+    int leading_edge = 0;
+    int trailing_edge = on_edge ? kPaddingFromShelf : 0;
+    if (shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
+      set_border(views::Border::CreateEmptyBorder(
+          inner_edge, leading_edge, outer_edge, trailing_edge);
+    } else if (shelf_alignment() == SHELF_ALIGNMENT_LEFT) {
+      set_border(views::Border::CreateEmptyBorder(
+          leading_edge, outer_edge, trailing_edge, inner_edge));
+    } else { // SHELF_ALIGNMENT_RIGHT
+      set_border(views::Border::CreateEmptyBorder(
+          leading_edge,
+          inner_edge,
+          trailing_edge,
+          outer_edge));
+    }
   } else {
-    // Tray views are laid out right-to-left or bottom-to-top
-    int on_edge = (this == parent->child_at(0));
     // Change the border padding for different shelf alignment.
     if (shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
       set_border(views::Border::CreateEmptyBorder(
           0, 0,
           on_edge ? kPaddingFromBottomOfScreenBottomAlignment :
                     kPaddingFromBottomOfScreenBottomAlignment - 1,
           on_edge ? kPaddingFromRightEdgeOfScreenBottomAlignment : 0));
     } else if (shelf_alignment() == SHELF_ALIGNMENT_TOP) {
       set_border(views::Border::CreateEmptyBorder(
           on_edge ? kPaddingFromBottomOfScreenBottomAlignment :
@@ skipping 36 matching lines @@
 gfx::Rect TrayBackgroundView::GetBubbleAnchorRect(
     views::Widget* anchor_widget,
     TrayBubbleView::AnchorType anchor_type,
     TrayBubbleView::AnchorAlignment anchor_alignment) const {
   gfx::Rect rect;
   if (anchor_widget && anchor_widget->IsVisible()) {
     rect = anchor_widget->GetWindowBoundsInScreen();
     if (anchor_type == TrayBubbleView::ANCHOR_TYPE_TRAY) {
       if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM) {
         bool rtl = base::i18n::IsRTL();
-        rect.Inset(
-            rtl ? kPaddingFromRightEdgeOfScreenBottomAlignment : 0,
-            kTrayBubbleAnchorTopInsetBottomAnchor,
-            rtl ? 0 : kPaddingFromRightEdgeOfScreenBottomAlignment,
-            kPaddingFromBottomOfScreenBottomAlignment);
+        if (!ash::switches::UseAlternateShelfLayout()) {
+          rect.Inset(
+              rtl ? kPaddingFromRightEdgeOfScreenBottomAlignment : 0,
+              kTrayBubbleAnchorTopInsetBottomAnchor,
+              rtl ? 0 : kPaddingFromRightEdgeOfScreenBottomAlignment,
+              kPaddingFromBottomOfScreenBottomAlignment);
+        } else {
+          rect.Inset(
+              rtl ? kAlternateLayoutBubblePaddingHorizontalSide : 0,
+              kAlternateLayoutBubblePaddingHorizontalBottom,
+              rtl ? 0 : kAlternateLayoutBubblePaddingHorizontalSide,
+              0);
+        }
       } else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_LEFT) {
-        rect.Inset(0, 0, kPaddingFromInnerEdgeOfLauncherVerticalAlignment + 5,
-                   kPaddingFromBottomOfScreenVerticalAlignment);
+        if (!ash::switches::UseAlternateShelfLayout()) {
+          rect.Inset(0, 0, kPaddingFromInnerEdgeOfLauncherVerticalAlignment + 5,
+                     kPaddingFromBottomOfScreenVerticalAlignment);
+        } else {
+          rect.Inset(0, 0, kAlternateLayoutBubblePaddingVerticalSide + 4,
+                     kAlternateLayoutBubblePaddingVerticalBottom);
+        }
       } else {
-        rect.Inset(kPaddingFromInnerEdgeOfLauncherVerticalAlignment + 1,
-                   0, 0, kPaddingFromBottomOfScreenVerticalAlignment);
+        if (!ash::switches::UseAlternateShelfLayout()) {
+          rect.Inset(kPaddingFromInnerEdgeOfLauncherVerticalAlignment + 1,
+                     0, 0, kPaddingFromBottomOfScreenVerticalAlignment);
+        } else {
+          rect.Inset(kAlternateLayoutBubblePaddingVerticalSide, 0, 0,
+                     kAlternateLayoutBubblePaddingVerticalBottom);
+        }
       }
     } else if (anchor_type == TrayBubbleView::ANCHOR_TYPE_BUBBLE) {
       // Invert the offsets to align with the bubble below.
       // Note that with the alternate shelf layout the tips are not shown and
       // the offsets for left and right alignment do not need to be applied.
       int vertical_alignment = ash::switches::UseAlternateShelfLayout() ?
-          0 : kPaddingFromInnerEdgeOfLauncherVerticalAlignment;
-      if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_LEFT) {
-        rect.Inset(vertical_alignment,
-                   0, 0, kPaddingFromBottomOfScreenVerticalAlignment);
-      } else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT) {
-        rect.Inset(0, 0, vertical_alignment,
-                   kPaddingFromBottomOfScreenVerticalAlignment);
-      }
+          0 :
+          kPaddingFromInnerEdgeOfLauncherVerticalAlignment;
+      int horizontal_alignment = ash::switches::UseAlternateShelfLayout() ?
+          kAlternateLayoutBubblePaddingVerticalBottom :
+          kPaddingFromBottomOfScreenVerticalAlignment;
+      if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_LEFT)
+        rect.Inset(vertical_alignment, 0, 0, horizontal_alignment);
+      else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT)
+        rect.Inset(0, 0, vertical_alignment, horizontal_alignment);
     }
   }
 
   // TODO(jennyz): May need to add left/right alignment in the following code.
   if (rect.IsEmpty()) {
     aura::RootWindow* target_root = anchor_widget ?
         anchor_widget->GetNativeView()->GetRootWindow() :
         Shell::GetPrimaryRootWindow();
     rect = target_root->bounds();
     rect = gfx::Rect(
@@ skipping 46 matching lines @@
   ash::internal::ShelfLayoutManager* shelf =
       ShelfLayoutManager::ForLauncher(root_window);
   bubble_view->SetArrowPaintType(
       (shelf && shelf->IsVisible()) ?
       views::BubbleBorder::PAINT_NORMAL :
       views::BubbleBorder::PAINT_TRANSPARENT);
 }
 
 }  // namespace internal
 }  // namespace ash