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

ash/shelf/alternate_app_list_button.cc

 // Copyright 2013 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/alternate_app_list_button.h"
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher_button_host.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/views/controls/button/image_button.h"
 
 namespace ash {
 namespace internal {
-namespace {
-const int kImagePaddingFromShelf = 5;
-}  // namespace
 
 // static
 const int AlternateAppListButton::kImageBoundsSize = 7;
 
 
 AlternateAppListButton::AlternateAppListButton(views::ButtonListener* listener,
                                                LauncherButtonHost* host,
                                                ShelfWidget* shelf_widget)
     : views::ImageButton(listener),
       host_(host),
@@ skipping 62 matching lines @@
   const gfx::ImageSkia* forground_image =
       rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_ALTERNATE).ToImageSkia();
 
   gfx::Rect contents_bounds = GetContentsBounds();
   gfx::Rect background_bounds, forground_bounds;
 
   ShelfAlignment alignment = shelf_widget_->GetAlignment();
   background_bounds.set_size(background_image->size());
   if (alignment == SHELF_ALIGNMENT_LEFT) {
     background_bounds.set_x(contents_bounds.width() -
-        kImagePaddingFromShelf - background_image->width());
+        ShelfLayoutManager::kShelfItemInset - background_image->width());

[Mr4D (OOO till 08-26), 2013/09/18 00:07:49]

Apparently the old value was 5 and this is 3 - I guess that is meant to be?

[Harry McCleave, 2013/09/18 01:34:56]

Yes, this is intended to keep all items aligned.

     background_bounds.set_y(contents_bounds.y() +
         (contents_bounds.height() - background_image->height()) / 2);
   } else if(alignment == SHELF_ALIGNMENT_RIGHT) {
-    background_bounds.set_x(kImagePaddingFromShelf);
+    background_bounds.set_x(ShelfLayoutManager::kShelfItemInset);
     background_bounds.set_y(contents_bounds.y() +
         (contents_bounds.height() - background_image->height()) / 2);
   } else {
-    background_bounds.set_y(kImagePaddingFromShelf);
+    background_bounds.set_y(ShelfLayoutManager::kShelfItemInset);
     background_bounds.set_x(contents_bounds.x() +
         (contents_bounds.width() - background_image->width()) / 2);
   }
 
   forground_bounds.set_size(forground_image->size());
   forground_bounds.set_x(background_bounds.x() +
       std::max(0,
           (background_bounds.width() - forground_bounds.width()) / 2));
   forground_bounds.set_y(background_bounds.y() +
       std::max(0,
@@ skipping 10 matching lines @@
 }
 
 void AlternateAppListButton::GetAccessibleState(
     ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = host_->GetAccessibleName(this);
 }
 
 }  // namespace internal
 }  // namespace ash