[ash-md] Animates a window closed while in overview mode

ash/common/wm/overview/window_selector_item.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/common/wm/overview/window_selector_item.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 76 matching lines @@
 
 // Height of an item header in Material Design.
 static const int kHeaderHeight = 32;
 
 // Opacity for dimmed items.
 static const float kDimmedItemOpacity = 0.5f;
 
 // Duration of background opacity transition for the selected label.
 static const int kSelectorFadeInMilliseconds = 350;
 
+// Before closing window animate the tile to shrink by this fraction of size.

[tdanderson, 2016/06/28 15:28:02]

Maybe specify what is meant by 'tile' (here and line 405)

[varkha, 2016/06/28 23:50:36]

Done.

+static const float kPreCloseScale = 0.02f;
+
 // Calculates the |window| bounds after being transformed to the selector's
 // space. The returned Rect is in virtual screen coordinates.
 gfx::Rect GetTransformedBounds(WmWindow* window) {
   gfx::RectF bounds(
       window->GetRootWindow()->ConvertRectToScreen(window->GetTargetBounds()));
   gfx::Transform new_transform = TransformAboutPivot(
       gfx::Point(bounds.x(), bounds.y()), window->GetTargetTransform());
   new_transform.TransformRect(&bounds);
 
   // With Material Design the preview title is shown above the preview window.
@@ skipping 277 matching lines @@
 }
 
 void WindowSelectorItem::SetDimmed(bool dimmed) {
   dimmed_ = dimmed;
   SetOpacity(dimmed ? kDimmedItemOpacity : 1.0f);
 }
 
 void WindowSelectorItem::ButtonPressed(views::Button* sender,
                                        const ui::Event& event) {
   if (sender == close_button_) {
+    if (ash::MaterialDesignController::IsOverviewMaterial()) {
+      gfx::Rect inset_bounds(target_bounds_);
+      inset_bounds.Inset(target_bounds_.width() * kPreCloseScale,
+                         target_bounds_.height() * kPreCloseScale);
+      OverviewAnimationType animation_type =
+          OverviewAnimationType::OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS;
+      SetBounds(inset_bounds, animation_type);
+      // First animate opacity first to intermediate value at the same time as

[tdanderson, 2016/06/28 15:28:02]

nit: remove one first

[varkha, 2016/06/28 23:50:36]

Done.

+      // shrinking the tile.
+      AnimateOpacity(kDimmedItemOpacity, animation_type);
+
+      // Fade out the tile effectively hiding it.

[tdanderson, 2016/06/28 15:28:02]

nit: tile,

[varkha, 2016/06/28 23:50:36]

Done.

+      AnimateOpacity(
+          0.0, OverviewAnimationType::OVERVIEW_ANIMATION_CLOSE_SELECTOR_ITEM);
+    }
     transform_window_.Close();
     return;
   }
   CHECK(sender == window_label_button_view_);
   window_selector_->SelectWindow(transform_window_.window());
 }
 
 void WindowSelectorItem::OnWindowDestroying(WmWindow* window) {
   window->RemoveObserver(this);
   transform_window_.OnWindowDestroyed();
@@ skipping 139 matching lines @@
 
     if (!window_label_button_view_->visible()) {
       window_label_button_view_->SetVisible(true);
       SetupFadeInAfterLayout(window_label_.get());
       SetupFadeInAfterLayout(window_label_selector_.get());
     }
     WmWindow* window_label_window =
         WmLookup::Get()->GetWindowForWidget(window_label_.get());
     WmWindow* window_label_selector_window =
         WmLookup::Get()->GetWindowForWidget(window_label_selector_.get());
+    std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings =
+        ScopedOverviewAnimationSettingsFactory::Get()
+            ->CreateOverviewAnimationSettings(animation_type,
+                                              window_label_window);
+    std::unique_ptr<ScopedOverviewAnimationSettings>
+        animation_settings_selector =
+            ScopedOverviewAnimationSettingsFactory::Get()
+                ->CreateOverviewAnimationSettings(animation_type,
+                                                  window_label_selector_window);
     window_label_selector_window->SetBounds(label_rect);
     // |window_label_window| covers both the transformed window and the header
     // as well as the gap between the windows to prevent events from reaching
     // the window including its sizing borders.
     label_rect.set_height(label_rect.height() +
                           transformed_window_bounds.height());
     label_rect.Inset(-kWindowSelectorMargin, -kWindowSelectorMargin);
     window_label_window->SetBounds(label_rect);
-    std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings =
-        ScopedOverviewAnimationSettingsFactory::Get()
-            ->CreateOverviewAnimationSettings(animation_type,
-                                              window_label_window);
     gfx::Transform label_transform;
     label_transform.Translate(transformed_window_bounds.x(),
                               transformed_window_bounds.y());
     window_label_window->SetTransform(label_transform);
     window_label_selector_window->SetTransform(label_transform);
   } else {
     if (!close_button_->visible()) {
       close_button_->SetVisible(true);
       SetupFadeInAfterLayout(close_button_widget_.get());
     }
     WmWindow* close_button_widget_window =
         WmLookup::Get()->GetWindowForWidget(close_button_widget_.get());
     std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings =
         ScopedOverviewAnimationSettingsFactory::Get()
             ->CreateOverviewAnimationSettings(animation_type,
                                               close_button_widget_window);
 
     gfx::Transform close_button_transform;
     close_button_transform.Translate(transformed_window_bounds.right(),
                                      transformed_window_bounds.y());
     close_button_widget_window->SetTransform(close_button_transform);
   }
 }
 
+void WindowSelectorItem::AnimateOpacity(float opacity,
+                                        OverviewAnimationType animation_type) {

[tdanderson, 2016/06/28 15:28:02]

consider a DCHECK or similar to verify |opacity| is a legal opacity value?

[varkha, 2016/06/28 23:50:36]

Done.

+  ScopedTransformOverviewWindow::ScopedAnimationSettings animation_settings;
+  transform_window_.BeginScopedAnimation(animation_type, &animation_settings);
+  transform_window_.SetOpacity(opacity);
+
+  WmWindow* window_label_window =
+      WmLookup::Get()->GetWindowForWidget(window_label_.get());
+  std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings_label =
+      ScopedOverviewAnimationSettingsFactory::Get()
+          ->CreateOverviewAnimationSettings(animation_type,
+                                            window_label_window);
+  window_label_window->SetOpacity(opacity);
+
+  WmWindow* window_label_selector_window =
+      WmLookup::Get()->GetWindowForWidget(window_label_selector_.get());
+  std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings_selector =
+      ScopedOverviewAnimationSettingsFactory::Get()
+          ->CreateOverviewAnimationSettings(animation_type,
+                                            window_label_selector_window);
+  window_label_selector_window->SetOpacity(opacity);
+}
+
 void WindowSelectorItem::UpdateCloseButtonAccessibilityName() {
   close_button_->SetAccessibleName(l10n_util::GetStringFUTF16(
       IDS_ASH_OVERVIEW_CLOSE_ITEM_BUTTON_ACCESSIBLE_NAME,
       GetWindow()->GetTitle()));
 }
 
 }  // namespace ash