Experimental app list: Enforce a 24-pixel padding on the top and sides.

ui/app_list/views/folder_header_view.cc

 // Copyright (c) 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 "ui/app_list/views/folder_header_view.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_folder_item.h"
+#include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/painter.h"
 
 namespace app_list {
 
 namespace {
 
 const int kPreferredWidth = 360;
 const int kPreferredHeight = 48;
 const int kIconDimension = 24;
-const int kPadding = 14;
-const int kBottomSeparatorPadding = 9;
+const int kBackButtonPadding = 14;
+const int kBottomSeparatorPadding = 9;  // Non-experimental app list only.
 const int kBottomSeparatorHeight = 1;
 const int kMaxFolderNameWidth = 300;
 
 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 
 }  // namespace
 
 class FolderHeaderView::FolderNameView : public views::Textfield {
  public:
   FolderNameView() {
@@ skipping 110 matching lines @@
 gfx::Size FolderHeaderView::GetPreferredSize() const {
   return gfx::Size(kPreferredWidth, kPreferredHeight);
 }
 
 void FolderHeaderView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   gfx::Rect back_bounds(rect);
-  back_bounds.set_width(kIconDimension + 2 * kPadding);
+  back_bounds.set_width(kIconDimension + 2 * kBackButtonPadding);
+  if (app_list::switches::IsExperimentalAppListEnabled()) {
+    // Align the left edge of the button image with the left margin of the
+    // launcher window. Note that this means the physical button dimensions
+    // extends slightly into the margin.
+    back_bounds.set_x(kExperimentalWindowPadding - kBackButtonPadding);
+  }
   back_button_->SetBoundsRect(back_bounds);
 
   gfx::Rect text_bounds(rect);
   base::string16 text = folder_item_ && !folder_item_->name().empty()
                             ? base::UTF8ToUTF16(folder_item_->name())
                             : folder_name_placeholder_text_;
   int text_width =
       gfx::Canvas::GetStringWidth(text, folder_name_view_->GetFontList()) +
       folder_name_view_->GetCaretBounds().width() +
       folder_name_view_->GetInsets().width();
@@ skipping 13 matching lines @@
 }
 
 void FolderHeaderView::OnPaint(gfx::Canvas* canvas) {
   views::View::OnPaint(canvas);
 
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty() || !folder_name_visible_)
     return;
 
   // Draw bottom separator line.
-  rect.set_x(kBottomSeparatorPadding);
+  int horizontal_padding = app_list::switches::IsExperimentalAppListEnabled()
+                               ? kExperimentalWindowPadding
+                               : kBottomSeparatorPadding;
+  rect.set_x(horizontal_padding);
   rect.set_y(rect.y() + rect.height() - kBottomSeparatorHeight);

[calamity, 2014/09/19 05:10:56]

Use rect.bottom().

[Matt Giuca, 2014/09/19 09:56:05]

Done.

-  rect.set_width(rect.width() - kBottomSeparatorPadding * 2);
+  rect.set_width(rect.width() - horizontal_padding * 2);

[calamity, 2014/09/19 05:10:56]

Use Rect::Inset().

[Matt Giuca, 2014/09/19 09:56:05]

Done.

   rect.set_height(kBottomSeparatorHeight);
   canvas->FillRect(rect, kTopSeparatorColor);
 }
 
 void FolderHeaderView::ContentsChanged(views::Textfield* sender,
                                        const base::string16& new_contents) {
   // Temporarily remove from observer to ignore data change caused by us.
   if (!folder_item_)
     return;
 
@@ skipping 13 matching lines @@
 void FolderHeaderView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   delegate_->NavigateBack(folder_item_, event);
 }
 
 void FolderHeaderView::ItemNameChanged() {
   Update();
 }
 
 }  // namespace app_list