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

ash/shelf/shelf_layout_manager.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/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <string>
@@ skipping 55 matching lines @@
 // For instance:
 // - Primary display is left of secondary display.
 // - Shelf is left aligned
 // - This ShelfLayoutManager manages the shelf for the secondary display.
 // |kMaxAutoHideShowShelfRegionSize| refers to the maximum size of the region
 // from the right edge of the primary display which can trigger showing the
 // auto hidden shelf. The region is used to make it easier to trigger showing
 // the auto hidden shelf when the shelf is on the boundary between displays.
 const int kMaxAutoHideShowShelfRegionSize = 10;
 
-// Const inset from the edget of the shelf to the edget of the status area.
-const int kStatusAreaInset = 3;
-
 ui::Layer* GetLayer(views::Widget* widget) {
   return widget->GetNativeView()->layer();
 }
 
 bool IsDraggingTrayEnabled() {
   static bool dragging_tray_allowed = CommandLine::ForCurrentProcess()->
       HasSwitch(ash::switches::kAshEnableTrayDragging);
   return dragging_tray_allowed;
 }
 
 }  // namespace
 
 // static
 const int ShelfLayoutManager::kWorkspaceAreaVisibleInset = 2;
 
 // static
 const int ShelfLayoutManager::kWorkspaceAreaAutoHideInset = 5;
 
 // static
 const int ShelfLayoutManager::kAutoHideSize = 3;
 
 // static
 const int ShelfLayoutManager::kShelfSize = 47;
 
+// static
+const int ShelfLayoutManager::kShelfItemInset = 3;
+
 int ShelfLayoutManager::GetPreferredShelfSize() {
   return ash::switches::UseAlternateShelfLayout() ?
       ShelfLayoutManager::kShelfSize : kLauncherPreferredSize;
 }
 
 // ShelfLayoutManager::AutoHideEventFilter -------------------------------------
 
 // Notifies ShelfLayoutManager any time the mouse moves.
 class ShelfLayoutManager::AutoHideEventFilter : public ui::EventHandler {
  public:
@@ skipping 649 matching lines @@
       gfx::Rect(available_bounds.x(), available_bounds.y(),
                     shelf_width, available_bounds.height()),
       gfx::Rect(available_bounds.right() - shelf_width, available_bounds.y(),
                     shelf_width, available_bounds.height()),
       gfx::Rect(available_bounds.x(), available_bounds.y(),
                     available_bounds.width(), shelf_height));
 
   int status_inset = std::max(0, GetPreferredShelfSize() -
       PrimaryAxisValue(status_size.height(), status_size.width()));
 
-  if (ash::switches::UseAlternateShelfLayout())
-    status_inset = kStatusAreaInset;
+  if (ash::switches::UseAlternateShelfLayout()) {
+    status_inset = 0;
+    if (IsHorizontalAlignment())
+      status_size.set_height(kShelfSize);
+    else
+      status_size.set_width(kShelfSize);
+  }
 
   target_bounds->status_bounds_in_shelf = SelectValueForShelfAlignment(
       gfx::Rect(base::i18n::IsRTL() ? 0 : shelf_width - status_size.width(),
                     status_inset, status_size.width(), status_size.height()),
       gfx::Rect(shelf_width - (status_size.width() + status_inset),
                     shelf_height - status_size.height(), status_size.width(),
                     status_size.height()),
       gfx::Rect(status_inset, shelf_height - status_size.height(),
                     status_size.width(), status_size.height()),
       gfx::Rect(base::i18n::IsRTL() ? 0 : shelf_width - status_size.width(),
@@ skipping 91 matching lines @@
     // Move and size the launcher with the gesture.
     int shelf_height = target_bounds->shelf_bounds_in_root.height() - translate;
     shelf_height = std::max(shelf_height, kAutoHideSize);
     target_bounds->shelf_bounds_in_root.set_height(shelf_height);
     if (GetAlignment() == SHELF_ALIGNMENT_BOTTOM) {
       target_bounds->shelf_bounds_in_root.set_y(
           available_bounds.bottom() - shelf_height);
     }
 
     if (ash::switches::UseAlternateShelfLayout()) {
-      target_bounds->status_bounds_in_shelf.set_y(kStatusAreaInset);
+      target_bounds->status_bounds_in_shelf.set_y(0);
     } else {
       // The statusbar should be in the center of the shelf.
       gfx::Rect status_y = target_bounds->shelf_bounds_in_root;
       status_y.set_y(0);
       status_y.ClampToCenteredSize(
           target_bounds->status_bounds_in_shelf.size());
       target_bounds->status_bounds_in_shelf.set_y(status_y.y());
     }
   } else {
     // Move and size the launcher with the gesture.
     int shelf_width = target_bounds->shelf_bounds_in_root.width();
     bool right_aligned = GetAlignment() == SHELF_ALIGNMENT_RIGHT;
     if (right_aligned)
       shelf_width -= translate;
     else
       shelf_width += translate;
     shelf_width = std::max(shelf_width, kAutoHideSize);
     target_bounds->shelf_bounds_in_root.set_width(shelf_width);
     if (right_aligned) {
       target_bounds->shelf_bounds_in_root.set_x(
           available_bounds.right() - shelf_width);
     }
 
     if (ash::switches::UseAlternateShelfLayout()) {
-      if (right_aligned) {
-        target_bounds->status_bounds_in_shelf.set_x(kStatusAreaInset);
-      } else {
+      if (right_aligned)
+        target_bounds->status_bounds_in_shelf.set_x(0);
+      else
         target_bounds->status_bounds_in_shelf.set_x(
-            available_bounds.right() - shelf_width + kStatusAreaInset);
-      }
+            target_bounds->shelf_bounds_in_root.width() -
+            kShelfSize);
     } else {
       // The statusbar should be in the center of the shelf.
       gfx::Rect status_x = target_bounds->shelf_bounds_in_root;
       status_x.set_x(0);
       status_x.ClampToCenteredSize(
           target_bounds->status_bounds_in_shelf.size());
       target_bounds->status_bounds_in_shelf.set_x(status_x.x());
     }
   }
 }
@@ skipping 223 matching lines @@
       return gfx::Insets(0, distance, 0, 0);
     case SHELF_ALIGNMENT_TOP:
       return gfx::Insets(0, 0, distance, 0);
   }
   NOTREACHED();
   return gfx::Insets();
 }
 
 }  // namespace internal
 }  // namespace ash