Animate the app list search box shadow.

ui/app_list/views/search_box_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 "ui/app_list/views/search_box_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
@@ skipping 25 matching lines @@
 const int kPreferredHeight = 48;
 
 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 
 // Menu offset relative to the bottom-right corner of the menu button.
 const int kMenuYOffsetFromButton = -4;
 const int kMenuXOffsetFromButton = -7;
 
 const int kBackgroundBorderCornerRadius = 2;
 
-const int kShadowBlur = 4;
-const int kShadowYOffset = 2;
-const SkColor kShadowColor = SkColorSetARGB(0x33, 0, 0, 0);
-
 // A background that paints a solid white rounded rect with a thin grey border.
 class ExperimentalSearchBoxBackground : public views::Background {
  public:
   ExperimentalSearchBoxBackground() {}
   ~ExperimentalSearchBoxBackground() override {}
 
  private:
   // views::Background overrides:
   void Paint(gfx::Canvas* canvas, views::View* view) const override {
     gfx::Rect bounds = view->GetContentsBounds();
@@ skipping 18 matching lines @@
       icon_view_(NULL),
       back_button_(NULL),
       speech_button_(NULL),
       menu_button_(NULL),
       search_box_(new views::Textfield),
       contents_view_(NULL) {
   SetLayoutManager(new views::FillLayout);
   AddChildView(content_container_);
 
   if (switches::IsExperimentalAppListEnabled()) {
-    SetBorder(make_scoped_ptr(
-        new views::ShadowBorder(kShadowBlur, kShadowColor, kShadowYOffset, 0)));
+    SetShadow(GetShadowForZHeight(1));
     back_button_ = new views::ImageButton(this);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     back_button_->SetImage(
         views::ImageButton::STATE_NORMAL,
         rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
     back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                                     views::ImageButton::ALIGN_MIDDLE);
     content_container_->AddChildView(back_button_);
 
     content_container_->set_background(new ExperimentalSearchBoxBackground());
@@ skipping 68 matching lines @@
   // Updates model and fires query changed manually because SetText() above
   // does not generate ContentsChanged() notification.
   UpdateModel();
   NotifyQueryChanged();
 }
 
 void SearchBoxView::InvalidateMenu() {
   menu_.reset();
 }
 
+void SearchBoxView::SetShadow(const gfx::ShadowValue& shadow) {
+  SetBorder(make_scoped_ptr(new views::ShadowBorder(shadow)));
+  Layout();
+}
+
 gfx::Rect SearchBoxView::GetViewBoundsForSearchBoxContentsBounds(
     const gfx::Rect& rect) const {
   gfx::Rect view_bounds = rect;
-  view_bounds.Inset(GetInsets().Scale(-1));
+  view_bounds.Inset(-GetInsets());
   return view_bounds;
 }
 
 gfx::Size SearchBoxView::GetPreferredSize() const {
   return gfx::Size(kPreferredWidth, kPreferredHeight);
 }
 
 bool SearchBoxView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (contents_view_)
     return contents_view_->OnMouseWheel(event);
 
   return false;
 }
 
 void SearchBoxView::OnEnabledChanged() {
   search_box_->SetEnabled(enabled());
   if (menu_button_)
     menu_button_->SetEnabled(enabled());
   if (speech_button_)
     speech_button_->SetEnabled(enabled());
 }
 
+// static
+gfx::ShadowValue SearchBoxView::GetShadowForZHeight(int z_height) {
+  if (z_height <= 0)
+    return gfx::ShadowValue();
+
+  if (z_height == 1) {

[Matt Giuca, 2015/02/06 04:32:27]

How about

switch (z_height) {
  case 1:
  case 2:
  default:
}

(Still keeping the <= 0 case at the front.)

[calamity, 2015/02/06 05:17:51]

Kay.

+    return gfx::ShadowValue(gfx::Point(0, kCardShadowYOffset), kCardShadowBlur,
+                            kCardShadowColor);
+  }
+
+  if (z_height == 2)
+    return gfx::ShadowValue(gfx::Point(0, 2), 4, SkColorSetARGB(0x33, 0, 0, 0));

[Matt Giuca, 2015/02/06 04:32:27]

Without going all the way of defining new constants for these values, can we at
least make them dependent on the constants?

gfx::ShadowValue(gfx::Point(0, kCardShadowYOffset * 2), kCardShadowBlur * 2,
SkColorSetARGB(0x33, 0, 0, 0));

[calamity, 2015/02/06 05:17:51]

I don't think this necessarily a good idea. How about moving this whole function
to app_list_constants.cc? Also, since sky made me remove the other ShadowBorder
constructor, I can delete all the cardshadow constants and just leave it defined
inside this function.

[Matt Giuca, 2015/02/06 05:42:18]

OK move it to app_list_constants and then it's justified to have all magic
numbers inside this function.

+
+  return gfx::ShadowValue(gfx::Point(0, 8), 12, SkColorSetARGB(0x3F, 0, 0, 0));

[Matt Giuca, 2015/02/06 04:32:27]

Is this ever used?

[calamity, 2015/02/06 05:17:51]

Nope. It's the 'touch' one in the mocks. I guess we can add it back later..? I
was thinking of moving this whole function to app_list_constants.cc. Then it
kind of makes sense to leave this here since it's the UI-approved shadow value.
Or we can remove it.

[Matt Giuca, 2015/02/06 05:42:18]

If it's moved to ALC, then just leave this here.

+}
+
 void SearchBoxView::UpdateModel() {
   // Temporarily remove from observer to ignore notifications caused by us.
   model_->search_box()->RemoveObserver(this);
   model_->search_box()->SetText(search_box_->text());
   model_->search_box()->SetSelectionModel(search_box_->GetSelectionModel());
   model_->search_box()->AddObserver(this);
 }
 
 void SearchBoxView::NotifyQueryChanged() {
   DCHECK(delegate_);
@@ skipping 90 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list