athena: Move windows in the stack backwards if the back-most window is closed.

athena/wm/window_overview_mode.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 "athena/wm/window_overview_mode.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
@@ skipping 171 matching lines @@
         state->top.Translate(x_translate, window->bounds().height() * 0.65);
         state->top.Scale(kMaxScale, kMaxScale);
         state->bottom = state->top;
         --index;
         continue;
       }
       UpdateTerminalStateForWindowAtIndex(window, index, windows.size());
     }
   }
 
   void UpdateTerminalStateForWindowAtIndex(aura::Window* window,

[oshima, 2014/09/03 19:50:35]

can you document this method?

[sadrul, 2014/09/03 20:24:36]

Done.

                                            size_t index,
                                            size_t window_count) {
     const int kGapBetweenWindowsBottom = 10;
     const int kGapBetweenWindowsTop = 5;
 
     const int container_width = container_->bounds().width();
     const int window_width = window->bounds().width();
     const int window_x = window->bounds().x();
     gfx::Transform top_transform;
     int top = (window_count - index - 1) * kGapBetweenWindowsTop;
@@ skipping 208 matching lines @@
     const bool dragging_towards_right = dragged_distance.x() < 0;
     const bool swipe_towards_right = event.details().velocity_x() > 0;
     if (dragging_towards_right != swipe_towards_right)
       return false;
     const float kMinVelocityForDismissal = 500.f;
     return std::abs(event.details().velocity_x()) > kMinVelocityForDismissal;
   }
 
   void CloseDragWindow(const ui::GestureEvent& gesture) {
     // Animate |dragged_window_| offscreen first, then destroy it.
     ui::ScopedLayerAnimationSettings settings(

[oshima, 2014/09/03 19:50:35]

optional:

the scope of this object out lives other scoped settings object
for other objects. I understand that that want't cause the problem,
but you may want to define a block for dragged_window_ animation.

[sadrul, 2014/09/03 20:24:36]

Done.

         dragged_window_->layer()->GetAnimator());
     settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     settings.AddObserver(new ui::ClosureAnimationObserver(
         base::Bind(&base::DeletePointer<aura::Window>, dragged_window_)));
 
     WindowOverviewState* dragged_state =
         dragged_window_->GetProperty(kWindowOverviewState);
     CHECK(dragged_state);
     gfx::Transform transform = dragged_window_->layer()->transform();
     gfx::RectF transformed_bounds = dragged_window_->bounds();
     transform.TransformRect(&transformed_bounds);
     float transform_x = 0.f;
     if (gesture.location().x() > dragged_start_location_.x())
       transform_x = container_->bounds().right() - transformed_bounds.x();
     else
       transform_x = -(transformed_bounds.x() + transformed_bounds.width());
     float scale = gfx::Tween::FloatValueBetween(
         dragged_state->progress, kMinScale, kMaxScale);
     transform.Translate(transform_x / scale, 0);
     dragged_window_->SetTransform(transform);
     dragged_window_->layer()->SetOpacity(kMinOpacity);
 
-    // Move the windows behind |dragged_window_| in the stack forward one step.
-    const aura::Window::Windows& list = container_->children();
-    for (aura::Window::Windows::const_iterator iter = list.begin();
-         iter != list.end() && *iter != dragged_window_;
-         ++iter) {
-      aura::Window* window = *iter;
-      ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
-      settings.SetPreemptionStrategy(
-          ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+    const aura::Window::Windows list = window_list_provider_->GetWindowList();
+    if (list.empty())

[oshima, 2014/09/03 19:50:35]

CHECK? (if you have dragged_window_, this shouldn't be empty?)

[sadrul, 2014/09/03 20:24:36]

Good point. Done.

+      return;
+    if (list.front() == dragged_window_) {
+      // There's no window behind |dragged_window_|. So move the windows in
+      // front take a step back.
+      for (aura::Window::Windows::const_reverse_iterator iter = list.rbegin();
+           iter != list.rend() && *iter != dragged_window_;
+           ++iter) {
+        aura::Window* window = *iter;
+        ui::ScopedLayerAnimationSettings settings(
+            window->layer()->GetAnimator());
+        settings.SetPreemptionStrategy(
+            ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
 
-      aura::Window* next = *(iter + 1);
-      WindowOverviewState* next_state = next->GetProperty(kWindowOverviewState);
-      UpdateTerminalStateForWindowAtIndex(window, list.end() - iter,
-                                          list.size());
-      SetWindowProgress(window, next_state->progress);
+        aura::Window* next = *(iter + 1);
+        WindowOverviewState* next_state =
+            next->GetProperty(kWindowOverviewState);
+        UpdateTerminalStateForWindowAtIndex(
+            window, iter - list.rbegin(), list.size());
+        SetWindowProgress(window, next_state->progress);
+      }
+    } else {
+      // Move the windows behind |dragged_window_| in the stack forward one
+      // step.
+      for (aura::Window::Windows::const_iterator iter = list.begin();
+           iter != list.end() && *iter != dragged_window_;
+           ++iter) {
+        aura::Window* window = *iter;
+        ui::ScopedLayerAnimationSettings settings(
+            window->layer()->GetAnimator());
+        settings.SetPreemptionStrategy(
+            ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+
+        aura::Window* next = *(iter + 1);
+        WindowOverviewState* next_state =
+            next->GetProperty(kWindowOverviewState);
+        UpdateTerminalStateForWindowAtIndex(
+            window, list.end() - iter, list.size());
+        SetWindowProgress(window, next_state->progress);
+      }
     }
 
     dragged_window_ = NULL;
   }
 
   void RestoreDragWindow() {
     CHECK(dragged_window_);
     WindowOverviewState* dragged_state =
         dragged_window_->GetProperty(kWindowOverviewState);
     CHECK(dragged_state);
@@ skipping 140 matching lines @@
     aura::Window* container,
     const WindowListProvider* window_list_provider,
     SplitViewController* split_view_controller,
     WindowOverviewModeDelegate* delegate) {
   return scoped_ptr<WindowOverviewMode>(
       new WindowOverviewModeImpl(container, window_list_provider,
                                  split_view_controller, delegate));
 }
 
 }  // namespace athena