Animate window control changes in TouchView

ash/frame/caption_buttons/frame_caption_button_container_view.cc

Index: ash/frame/caption_buttons/frame_caption_button_container_view.cc
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.cc b/ash/frame/caption_buttons/frame_caption_button_container_view.cc
index f533f14a8119b6f39ed57c5bdb777ce7c71ad084..472dc61ae7e4b0d8d153f60344501998e088e035 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view.cc
+++ b/ash/frame/caption_buttons/frame_caption_button_container_view.cc
@@ -5,6 +5,7 @@
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 
 #include <cmath>
+#include <map>
 
 #include "ash/ash_switches.h"
 #include "ash/frame/caption_buttons/alternate_frame_size_button.h"
@@ -15,7 +16,10 @@
 #include "grit/ui_strings.h"  // Accessibility names
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
+#include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/gfx/animation/tween.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/point.h"
@@ -26,6 +30,14 @@ namespace ash {
 
 namespace {
 
+// Visual design parameters for animating the transition to maximize mode.
+// When the size button hides we delay sliding the minimize button into its
+// location. Also used to delay showing the size button so that the minimize
+// button slides out of that position.
+const int kAnimationDelayMs = 100;
+const int kMinimizeSlideDurationMs = 500;
+const int kSizeFadeDurationMs = 250;
+
 // Converts |point| from |src| to |dst| and hittests against |dst|.
 bool ConvertPointToViewAndHitTest(const views::View* src,
                                   const views::View* dst,
@@ -50,6 +62,9 @@ FrameCaptionButtonContainerView::FrameCaptionButtonContainerView(
       close_button_(NULL) {
   bool alternate_style = switches::UseAlternateFrameCaptionButtonStyle();
 
+  SetPaintToLayer(true);
+  SetFillsBoundsOpaquely(false);
+
   // Insert the buttons left to right.
   minimize_button_ = new FrameCaptionButton(this, CAPTION_BUTTON_ICON_MINIMIZE);
   minimize_button_->SetAccessibleName(
@@ -59,6 +74,8 @@ FrameCaptionButtonContainerView::FrameCaptionButtonContainerView(
   minimize_button_->SetVisible(
       minimize_allowed == MINIMIZE_ALLOWED &&
       (alternate_style || !frame_->widget_delegate()->CanMaximize()));
+  minimize_button_->SetPaintToLayer(true);
+  minimize_button_->SetFillsBoundsOpaquely(false);
   AddChildView(minimize_button_);
 
   if (alternate_style)
@@ -67,12 +84,16 @@ FrameCaptionButtonContainerView::FrameCaptionButtonContainerView(
     size_button_ = new FrameMaximizeButton(this, frame);
   size_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MAXIMIZE));
+  size_button_->SetPaintToLayer(true);
+  size_button_->SetFillsBoundsOpaquely(false);
   UpdateSizeButtonVisibility(false);
   AddChildView(size_button_);
 
   close_button_ = new FrameCaptionButton(this, CAPTION_BUTTON_ICON_CLOSE);
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE));
+  close_button_->SetPaintToLayer(true);
+  close_button_->SetFillsBoundsOpaquely(false);
   AddChildView(close_button_);
 }
 
@@ -143,8 +164,37 @@ void FrameCaptionButtonContainerView::UpdateSizeButtonVisibility(
   // time when ShellObserver::OnMaximizeModeStarted is called. This prevents
   // this method from performing that check, and instead relies on the calling
   // code to tell it to force being hidden.
-  size_button_->SetVisible(
-      !force_hidden && frame_->widget_delegate()->CanMaximize());
+
+  bool visible = !force_hidden && frame_->widget_delegate()->CanMaximize();
+
+  // Turning visibility off prevents animations from rendering. Setting the
+  // size button visibility to false will occur after the animation.
+  if (visible)
+    size_button_->SetVisible(visible);
+
+  ui::ScopedLayerAnimationSettings settings(
+      size_button_->layer()->GetAnimator());
+  settings.SetTransitionDuration(
+      base::TimeDelta::FromMilliseconds(kSizeFadeDurationMs));
+  settings.SetPreemptionStrategy(
+      ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+
+  if (visible) {
+    settings.SetTweenType(gfx::Tween::EASE_OUT);
+    // Delay fade in so that the minimize button has begun its sliding
+    // animation. For visual design.

[flackr, 2014/05/09 14:15:14]

For visual design reads a bit strange, I'm not sure it's necessary.

[jonross, 2014/05/09 14:45:47]

Done.

+    size_button_->layer()->GetAnimator()->SchedulePauseForProperties(
+        base::TimeDelta::FromMilliseconds(kAnimationDelayMs),
+        ui::LayerAnimationElement::OPACITY);
+    size_button_->layer()->SetOpacity(1.0f);
+  } else {
+    settings.SetTweenType(gfx::Tween::EASE_IN);
+    // Observer will call size_button_->SetVisible(false) upon completion of

[flackr, 2014/05/09 14:15:14]

We could probably avoid delaying the SetVisible(false) by acquiring the view's
layer before making it invisible and then animating and deleting the layer when
done.

https://code.google.com/p/chromium/codesearch#chromium/src/ui/compositor/laye...

That being said, this could be a TODO.

[jonross, 2014/05/09 14:45:47]

Done.

+    // the animation.
+    settings.AddObserver(this);
+    size_button_->layer()->SetOpacity(0.0f);
+    size_button_->layer()->SetVisible(false);
+  }
 }
 
 gfx::Size FrameCaptionButtonContainerView::GetPreferredSize() {
@@ -158,15 +208,49 @@ gfx::Size FrameCaptionButtonContainerView::GetPreferredSize() {
 }
 
 void FrameCaptionButtonContainerView::Layout() {
-  int x = 0;
-  for (int i = 0; i < child_count(); ++i) {
+  scoped_ptr<ui::ScopedLayerAnimationSettings> animation;
+  bool previous_child_animating = false;
+  bool previous_child_target_visibility = false;
+  int x = width();
+  for (int i = child_count() - 1; i >= 0; --i) {
     views::View* child = child_at(i);
-    if (!child->visible())
+    bool child_animating = child->layer()->GetAnimator()->is_animating();
+    bool child_target_visibility = child->layer()->GetTargetVisibility();
+    if (!child->visible() ||
+        (child_animating && !child_target_visibility)) {
+      previous_child_animating = child_animating;
+      previous_child_target_visibility = child_target_visibility;
       continue;
+    }
 
     gfx::Size size = child->GetPreferredSize();
+    // Animate the button if the previous button is currently animating
+    // its visibility.
+    if (previous_child_animating) {
+      if (previous_child_target_visibility) {
+        child->SetBounds(x, 0, size.width(), size.height());
+      } else {
+        // Delay sliding to where the previous button was located.
+        child->layer()->GetAnimator()->SchedulePauseForProperties(
+             base::TimeDelta::FromMilliseconds(kAnimationDelayMs),
+             ui::LayerAnimationElement::BOUNDS);
+      }
+
+      ui::ScopedLayerAnimationSettings* settings =
+          new ui::ScopedLayerAnimationSettings(child->layer()->GetAnimator());
+      settings->SetTransitionDuration(
+          base::TimeDelta::FromMilliseconds(kMinimizeSlideDurationMs));
+      settings->SetPreemptionStrategy(
+          ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+      settings->SetTweenType(gfx::Tween::EASE_OUT);
+      animation.reset(settings);
+      previous_child_target_visibility = child->layer()->GetTargetVisibility();
+    }
+    x -= size.width();
     child->SetBounds(x, 0, size.width(), size.height());
-    x += size.width();
+
+    previous_child_animating = child->layer()->GetAnimator()->is_animating();
+    previous_child_target_visibility = child->layer()->GetTargetVisibility();
   }
 }
 
@@ -218,7 +302,7 @@ void FrameCaptionButtonContainerView::ButtonPressed(views::Button* sender,
   if (sender == minimize_button_) {
     frame_->Minimize();
   } else if (sender == size_button_) {
-    if (frame_->IsFullscreen()) { // Can be clicked in immersive fullscreen.
+    if (frame_->IsFullscreen()) {  // Can be clicked in immersive fullscreen.
       frame_->SetFullscreen(false);
       action = ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_EXIT_FULLSCREEN;
     } else if (frame_->IsMaximized()) {
@@ -228,7 +312,7 @@ void FrameCaptionButtonContainerView::ButtonPressed(views::Button* sender,
       frame_->Maximize();
       action = ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MAXIMIZE;
     }
-  } else if(sender == close_button_) {
+  } else if (sender == close_button_) {
     frame_->Close();
     action = ash::UMA_WINDOW_CLOSE_BUTTON_CLICK;
   } else {
@@ -305,6 +389,18 @@ void FrameCaptionButtonContainerView::SetHoveredAndPressedButtons(
   }
 }
 
+void FrameCaptionButtonContainerView::OnImplicitAnimationsCompleted() {
+  size_button_->SetVisible(false);

[flackr, 2014/05/09 14:15:14]

This seems easy to accidentally trigger in some future patch. Is there any way
we can assure that this is only used from the animation to hide the size button?
Maybe DCHECK(!size_button_->layer()->GetTargetVisibility())?

[jonross, 2014/05/09 14:45:47]

Done.

+  // TODO(jonross): currently we need to delay telling the parent about the
+  // size change from visibility. When the size changes this forces a relayout
+  // and we want to animate both the bounds of FrameCaptionButtonContainerView
+  // along with that of its children. However when the parent is currently
+  // having its bounds changed this leads to strange animations where this view
+  // renders outside of its parents. Create a more specific animation where
+  // height and y are immediately fixed, and where we only animate width and x.
+  PreferredSizeChanged();

[flackr, 2014/05/09 14:15:14]

We only listen to animations complete on removing the button, do we need to
notify the parent when making the size button visible?

[jonross, 2014/05/09 14:45:47]

Currently views follow this pattern:
 - toggle visibility
 - set new bounds
 - layout
 - paint

So the container triggering the button becoming visibility already performs an
immediate layout based on the new size.

When not animating this also covers hiding.

So we would not gain anything from also doing this on becoming visible.

[flackr, 2014/05/09 15:44:23]

Sounds good.

+}
+
 FrameCaptionButtonContainerView::ButtonIconIds::ButtonIconIds()
     : icon_image_id(-1),
       inactive_icon_image_id(-1),