Visual improvements to text filtering in Ash overview mode

ash/wm/overview/window_selector.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/wm/overview/window_selector.h"
 
 #include <algorithm>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/ash_switches.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/switchable_windows.h"
 #include "ash/wm/overview/scoped_transform_overview_window.h"
 #include "ash/wm/overview/window_grid.h"
 #include "ash/wm/overview/window_selector_delegate.h"
 #include "ash/wm/overview/window_selector_item.h"
 #include "ash/wm/window_state.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/layout/box_layout.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 namespace {
 
 // The proportion of screen width that the text filter takes.
-const float kTextFilterScreenProportion = 0.5;
+const float kTextFilterScreenProportion = 0.25;
 
-// The height of the text filter.
-const int kTextFilterHeight = 50;
+// The amount of padding surrounding the text in the text filtering textbox.
+const int kTextFilterPadding = 3;
+
+// The font style used for text filtering.
+static const ::ui::ResourceBundle::FontStyle kTextFilterFontStyle =
+    ::ui::ResourceBundle::FontStyle::BaseFont;
 
 // Solid shadow length from the text filter.
 const int kVerticalShadowOffset = 1;
 
 // Amount of blur applied to the text filter shadow.
 const int kShadowBlur = 10;
 
 // Text filter shadow color.
 const SkColor kTextFilterShadow = 0xB0000000;
+const unsigned char kTextFilterOpacity = 128;

[tdanderson, 2014/07/17 19:45:26]

Admittedly a copy of WindowGrid::kWindowOverviewSelectorOpacity. Where would you
like to define shared constants such as this one?

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

As a static class var (like kTransitionMilliseconds in
scoped_transform_overview_window.h) probably on WindowSelector.

 
 // A comparator for locating a grid with a given root window.
 struct RootWindowGridComparator
     : public std::unary_function<WindowGrid*, bool> {
   explicit RootWindowGridComparator(const aura::Window* root_window)
       : root_window_(root_window) {
   }
 
   bool operator()(WindowGrid* grid) const {
     return (grid->root_window() == root_window_);
@@ skipping 34 matching lines @@
 void UpdateShelfVisibility() {
   Shell::RootWindowControllerList root_window_controllers =
       Shell::GetInstance()->GetAllRootWindowControllers();
   for (Shell::RootWindowControllerList::iterator iter =
           root_window_controllers.begin();
        iter != root_window_controllers.end(); ++iter) {
     (*iter)->UpdateShelfVisibility();
   }
 }
 
-// Initializes the text filter on the top of the main root window and requests
-// focus on its textfield.
-views::Widget* CreateTextFilter(views::TextfieldController* controller,
-                                aura::Window* root_window) {
-  views::Widget* widget = new views::Widget;
-  views::Widget::InitParams params;
-  params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
-  params.parent =
-      Shell::GetContainer(root_window, ash::kShellWindowId_OverlayContainer);
-  params.accept_events = true;
-  params.bounds = gfx::Rect(
-      root_window->bounds().width() / 2 * (1 - kTextFilterScreenProportion), 0,
-      root_window->bounds().width() * kTextFilterScreenProportion,
-      kTextFilterHeight);
-  widget->Init(params);
-
-  views::Textfield* textfield = new views::Textfield;
-  textfield->set_controller(controller);
-  textfield->SetBackgroundColor(SK_ColorTRANSPARENT);
-  textfield->SetBorder(views::Border::NullBorder());
-  textfield->SetTextColor(SK_ColorWHITE);
-  textfield->SetShadows(gfx::ShadowValues(1, gfx::ShadowValue(
-      gfx::Point(0, kVerticalShadowOffset), kShadowBlur, kTextFilterShadow)));
-  widget->SetContentsView(textfield);
-
-  gfx::Transform transform;
-  transform.Translate(0, -kTextFilterHeight);
-  widget->GetNativeWindow()->SetTransform(transform);
-  widget->Show();
-  textfield->RequestFocus();
-
-  return widget;
-}
-
 }  // namespace
 
 WindowSelector::WindowSelector(const WindowList& windows,
                                WindowSelectorDelegate* delegate)
     : delegate_(delegate),
       restore_focus_window_(aura::client::GetFocusClient(
           Shell::GetPrimaryRootWindow())->GetFocusedWindow()),
       ignore_activations_(false),
       selected_grid_index_(0),
       overview_start_time_(base::Time::Now()),
       num_key_presses_(0),
       num_items_(0),
-      showing_selection_widget_(false) {
+      showing_selection_widget_(false),
+      text_height_(0) {
   DCHECK(delegate_);
   Shell* shell = Shell::GetInstance();
   shell->OnOverviewModeStarting();
 
+  // Compute and store the height of the text used in text filtering.
+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+  text_height_ = bundle.GetFontList(kTextFilterFontStyle).GetHeight();
+
   if (restore_focus_window_)
     restore_focus_window_->AddObserver(this);
 
   const aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   for (aura::Window::Windows::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); iter++) {
     // Observed switchable containers for newly created windows on all root
     // windows.
     for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i) {
       aura::Window* container = Shell::GetContainer(*iter,
@@ skipping 75 matching lines @@
 
   // TODO(flackr): Change this to OnOverviewModeEnded and move it to when
   // everything is done.
   shell->OnOverviewModeEnding();
 
   // Clearing the window list resets the ignored_by_shelf flag on the windows.
   grid_list_.clear();
   UpdateShelfVisibility();
 }
 
+int WindowSelector::TextFilterHeight() const {

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

Can this be in anonymous namespace and use a static var which computes the text
height on the first call to it? We use this pattern for many one time
calculations in other ui classes.

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

This is gone in the next patch set.

+  DCHECK(text_height_ > 0);
+  return text_height_ + 2 * kTextFilterPadding;
+}
+
 void WindowSelector::CancelSelection() {
   delegate_->OnSelectionEnded();
 }
 
 void WindowSelector::OnGridEmpty(WindowGrid* grid) {
   ScopedVector<WindowGrid>::iterator iter =
       std::find(grid_list_.begin(), grid_list_.end(), grid);
   DCHECK(iter != grid_list_.end());
   grid_list_.erase(iter);
   // TODO(flackr): Use the previous index for more than two displays.
@@ skipping 129 matching lines @@
         text_filter_widget_->GetNativeWindow()->layer()->GetAnimator());
     animation_settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     animation_settings.SetTweenType(showing_selection_widget_ ?
         gfx::Tween::FAST_OUT_LINEAR_IN : gfx::Tween::LINEAR_OUT_SLOW_IN);
 
     gfx::Transform transform;
     if (should_show_selection_widget)
       transform.Translate(0, 0);
     else
-      transform.Translate(0, -kTextFilterHeight);
+      transform.Translate(0, -TextFilterHeight());
 
     text_filter_widget_->GetNativeWindow()->SetTransform(transform);
     showing_selection_widget_ = should_show_selection_widget;
   }
   for (ScopedVector<WindowGrid>::iterator iter = grid_list_.begin();
        iter != grid_list_.end(); iter++) {
     (*iter)->FilterItems(new_contents);
   }
 
   // If the selection widget is not active, execute a Move() command so that it
@@ skipping 70 matching lines @@
   // we made a full cycle on all the grids.
   for (size_t i = 0;
       i <= grid_list_.size() &&
       grid_list_[selected_grid_index_]->Move(direction, animate); i++) {
     // TODO(flackr): If there are more than two monitors, move between grids
     // in the requested direction.
     selected_grid_index_ = (selected_grid_index_ + 1) % grid_list_.size();
   }
 }
 
+views::Widget* WindowSelector::CreateTextFilter(
+    views::TextfieldController* controller,
+    aura::Window* root_window) {

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

Seems like this could still be in the anonymous namespace, I guess it was moved
out for TextFilterHeight, but that can also be in the anonymous namespace since
it's not unique per WindowSelector.

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

Done.

+  views::Widget* widget = new views::Widget;
+  views::Widget::InitParams params;
+  params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
+  params.parent =
+      Shell::GetContainer(root_window, ash::kShellWindowId_OverlayContainer);
+  params.accept_events = true;
+  params.bounds = gfx::Rect(
+      root_window->bounds().width() / 2 * (1 - kTextFilterScreenProportion), 0,
+      root_window->bounds().width() * kTextFilterScreenProportion,
+      TextFilterHeight());
+  widget->Init(params);
+
+  views::View* container = new views::View;
+  container->set_background(
+      views::Background::CreateSolidBackground(SK_ColorBLACK));
+  container->SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
+                                                   kTextFilterPadding,
+                                                   kTextFilterPadding,
+                                                   kTextFilterPadding));
+
+  views::Textfield* textfield = new views::Textfield;
+  textfield->set_controller(controller);
+  textfield->SetBackgroundColor(SK_ColorTRANSPARENT);
+  textfield->SetBorder(views::Border::NullBorder());
+  textfield->SetTextColor(SK_ColorWHITE);
+  textfield->SetShadows(gfx::ShadowValues(1, gfx::ShadowValue(
+      gfx::Point(0, kVerticalShadowOffset), kShadowBlur, kTextFilterShadow)));
+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+  textfield->SetFontList(bundle.GetFontList(kTextFilterFontStyle));
+
+  container->AddChildView(textfield);
+  widget->SetContentsView(container);
+
+  gfx::Transform transform;
+  transform.Translate(0, -TextFilterHeight());
+  widget->GetNativeWindow()->SetTransform(transform);
+  widget->SetOpacity(kTextFilterOpacity);
+
+  widget->Show();
+  textfield->RequestFocus();
+
+  return widget;
+}
+
 }  // namespace ash