Visual improvements to text filtering in Ash overview mode

ash/wm/overview/window_grid.cc

 // Copyright 2014 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/wm/overview/window_grid.h"
 
+#include "ash/ash_switches.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/overview/scoped_transform_overview_window.h"
 #include "ash/wm/overview/window_selector.h"
 #include "ash/wm/overview/window_selector_item.h"
 #include "ash/wm/overview/window_selector_panels.h"
 #include "ash/wm/overview/window_selector_window.h"
 #include "ash/wm/window_state.h"
+#include "base/command_line.h"
 #include "base/i18n/string_search.h"
 #include "base/memory/scoped_vector.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/vector2d.h"
 #include "ui/views/background.h"
 #include "ui/views/view.h"
@@ skipping 69 matching lines @@
 // The minimum number of cards along the major axis (i.e. horizontally on a
 // landscape orientation).
 const int kMinCardsMajor = 3;
 
 const int kOverviewSelectorTransitionMilliseconds = 100;
 
 // The color and opacity of the overview selector.
 const SkColor kWindowOverviewSelectionColor = SK_ColorBLACK;
 const unsigned char kWindowOverviewSelectorOpacity = 128;
 
+// The minimum amount of spacing between the bottom of the text filtering
+// text field and the top of the selection widget on the first row of items.
+const int kTextFilterSpacing = 5;

[flackr, 2014/07/18 13:41:51]

nit: How about something like kTextFilterBottomMargin which is a bit more
descriptive.

[tdanderson, 2014/08/07 20:13:07]

Done.

+
 // Returns the vector for the fade in animation.
 gfx::Vector2d GetSlideVectorForFadeIn(WindowSelector::Direction direction,
                                       const gfx::Rect& bounds) {
   gfx::Vector2d vector;
   switch (direction) {
     case WindowSelector::DOWN:
       vector.set_y(bounds.width());
       break;
     case WindowSelector::RIGHT:
       vector.set_x(bounds.height());
@@ skipping 56 matching lines @@
 
 void WindowGrid::PositionWindows(bool animate) {
   CHECK(!window_list_.empty());
 
   gfx::Size window_size;
   gfx::Rect total_bounds = ScreenUtil::ConvertRectToScreen(
       root_window_,
       ScreenUtil::GetDisplayWorkAreaBoundsInParent(
           Shell::GetContainer(root_window_, kShellWindowId_DefaultContainer)));
 
+  // If the text filtering feature is enabled, reserve space at the top for the
+  // text filtering textbox to appear.
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kAshDisableTextFilteringInOverviewMode)) {
+    total_bounds.Inset(
+        0,
+        window_selector_->TextFilterHeight() + kTextFilterSpacing,
+        0,
+        0);
+  }
+
   // Find the minimum number of windows per row that will fit all of the
   // windows on screen.
   num_columns_ = std::max(
       total_bounds.width() > total_bounds.height() ? kMinCardsMajor : 1,
       static_cast<int>(ceil(sqrt(total_bounds.width() * window_list_.size() /
                                  (kCardAspectRatio * total_bounds.height())))));
   int num_rows = ((window_list_.size() + num_columns_ - 1) / num_columns_);
   window_size.set_width(std::min(
       static_cast<int>(total_bounds.width() / num_columns_),
       static_cast<int>(total_bounds.height() * kCardAspectRatio / num_rows)));
@@ skipping 263 matching lines @@
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     selection_widget_->SetBounds(SelectedWindow()->target_bounds());
     selection_widget_->SetOpacity(kWindowOverviewSelectorOpacity);
     return;
   }
   selection_widget_->SetBounds(SelectedWindow()->target_bounds());
   selection_widget_->SetOpacity(kWindowOverviewSelectorOpacity);
 }
 
 }  // namespace ash