Aura: New window shadows, desktop background debug toggle

ash/wm/shadow.cc

Index: ash/wm/shadow.cc
diff --git a/ash/wm/shadow.cc b/ash/wm/shadow.cc
index e25a8e428066576601d69880868e17168accd500..39cbd15a3a9df509babaabf31355e2b418e204c8 100644
--- a/ash/wm/shadow.cc
+++ b/ash/wm/shadow.cc
@@ -7,45 +7,119 @@
 #include "ash/wm/image_grid.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/compositor/scoped_layer_animation_settings.h"
+
+namespace {
+
+// Shadow opacity for active window.
+const float kActiveShadowOpacity = 1.0f;
+
+// Shadow opacity for inactive window.
+const float kInactiveShadowOpacity = 0.2f;
+
+// Duration for opacity animation in milliseconds.
+const int64 kAnimationDurationMs = 200;
+
+}  // namespace
 
 namespace ash {
 namespace internal {
 
-Shadow::Shadow() {
+Shadow::Shadow() : style_(STYLE_ACTIVE) {
 }
 
 Shadow::~Shadow() {
 }
 
-ui::Layer* Shadow::layer() const { return image_grid_->layer(); }
-
 void Shadow::Init() {
   image_grid_.reset(new ImageGrid);
-
-  ResourceBundle& res = ResourceBundle::GetSharedInstance();
-  image_grid_->Init(&res.GetImageNamed(IDR_AURA_SHADOW_RECT_TOP_LEFT),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_TOP),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_TOP_RIGHT),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_LEFT),
-                    NULL,
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_RIGHT),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_BOTTOM_LEFT),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_BOTTOM),
-                    &res.GetImageNamed(IDR_AURA_SHADOW_RECT_BOTTOM_RIGHT));
+  UpdateImagesForStyle();
+  image_grid_->layer()->set_name("Shadow");
+  image_grid_->layer()->SetOpacity(
+      style_ == STYLE_ACTIVE ? kActiveShadowOpacity : kInactiveShadowOpacity);

[Daniel Erat, 2012/02/17 00:18:32]

mind changing this to a switch statement with a NOTREACHED() default case, just
so it'll blow up if someone adds a new style later but forgets to update this?

[James Cook, 2012/02/17 03:41:27]

Done.

 }
 
 void Shadow::SetContentBounds(const gfx::Rect& content_bounds) {
   content_bounds_ = content_bounds;
+  UpdateImageGridBounds();
+}
+
+ui::Layer* Shadow::layer() const {
+  return image_grid_->layer();
+}
+
+void Shadow::SetStyle(Style style) {
+  if (style_ == style)
+    return;
+  style_ = style;
+
+  // Stop waiting for any as yet unfinished implicit animations.
+  StopObservingImplicitAnimations();
+
+  // If we're becoming active, switch images now.  Because the inactive image
+  // has a very low opacity the switch isn't noticeable and this approach
+  // allows us to use only a single set of shadow images at a time.
+  if (style == STYLE_ACTIVE)
+    UpdateImagesForStyle();
+
+  {
+    // Property sets within this scope will be implicitly animated.
+    ui::ScopedLayerAnimationSettings settings(layer()->GetAnimator());
+    settings.AddObserver(this);
+    settings.SetTransitionDuration(
+        base::TimeDelta::FromMilliseconds(kAnimationDurationMs));
+    image_grid_->layer()->SetOpacity(
+        style_ == STYLE_ACTIVE ? kActiveShadowOpacity : kInactiveShadowOpacity);
+  }
+}
+
+void Shadow::OnImplicitAnimationsCompleted() {
+  // If we just finished going inactive, switch images.  This doesn't cause
+  // a visual pop because the inactive image opacity is so low.
+  if (style_ == STYLE_INACTIVE)
+    UpdateImagesForStyle();
+}
+
+void Shadow::UpdateImagesForStyle() {
+  ResourceBundle& res = ResourceBundle::GetSharedInstance();
+  if (style_ == STYLE_ACTIVE)

[Daniel Erat, 2012/02/17 00:18:32]

nit: change to a switch statement

[James Cook, 2012/02/17 03:41:27]

Done.

+    image_grid_->SetImages(
+        &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_TOP_LEFT),
+        &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_TOP),
+        &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_TOP_RIGHT),
+        &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_LEFT),
+        NULL,
+        &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_RIGHT),
+        &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_BOTTOM_LEFT),
+        &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_BOTTOM),
+        &res.GetImageNamed(IDR_AURA_SHADOW_ACTIVE_BOTTOM_RIGHT));
+  else
+    image_grid_->SetImages(
+        &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_TOP_LEFT),
+        &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_TOP),
+        &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_TOP_RIGHT),
+        &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_LEFT),
+        NULL,
+        &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_RIGHT),
+        &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_BOTTOM_LEFT),
+        &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_BOTTOM),
+        &res.GetImageNamed(IDR_AURA_SHADOW_INACTIVE_BOTTOM_RIGHT));
+
+  // Image sizes may have changed.
+  UpdateImageGridBounds();
+}
+
+void Shadow::UpdateImageGridBounds() {
   image_grid_->SetSize(
-      gfx::Size(content_bounds.width() +
+      gfx::Size(content_bounds_.width() +
                     image_grid_->left_image_width() +
                     image_grid_->right_image_width(),
-                content_bounds.height() +
+                content_bounds_.height() +
                     image_grid_->top_image_height() +
                     image_grid_->bottom_image_height()));
   image_grid_->layer()->SetBounds(
-      gfx::Rect(content_bounds.x() - image_grid_->left_image_width(),
-                content_bounds.y() - image_grid_->top_image_height(),
+      gfx::Rect(content_bounds_.x() - image_grid_->left_image_width(),
+                content_bounds_.y() - image_grid_->top_image_height(),
                 image_grid_->layer()->bounds().width(),
                 image_grid_->layer()->bounds().height()));
 }