Create a visible shelf and constrain window movement

ui/aura_shell/shelf_layout_manager.cc

 // Copyright (c) 2011 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 "ui/aura_shell/shelf_layout_manager.h"
 
 #include "base/auto_reset.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/gfx/compositor/layer.h"
@@ skipping 57 matching lines @@
 
   TargetBounds target_bounds;
   float target_opacity = visible ? 1.0f : 0.0f;
   CalculateTargetBounds(visible, &target_bounds);
   AnimateWidgetTo(launcher_, target_bounds.launcher_bounds, target_opacity);
   AnimateWidgetTo(status_, target_bounds.status_bounds, target_opacity);
   animating_ = true;
   // |visible_| is updated once the animation completes.
 }
 
+gfx::Rect ShelfLayoutManager::GetLauncherBounds() const {
+  return launcher_->GetWindowScreenBounds();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ShelfLayoutManager, aura::LayoutManager implementation:
 
 void ShelfLayoutManager::OnWindowResized() {
   LayoutShelf();
 }
 
 void ShelfLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
 }
 
@@ skipping 20 matching lines @@
     visible_ = !visible_;
   }
   GetLayer(launcher_)->GetAnimator()->StopAnimating();
 }
 
 void ShelfLayoutManager::CalculateTargetBounds(bool visible,
                                                TargetBounds* target_bounds) {
   const gfx::Rect& available_bounds(aura::RootWindow::GetInstance()->bounds());
   int y = available_bounds.bottom() - (visible ? max_height_ : 0);
   gfx::Rect status_bounds(status_->GetWindowScreenBounds());
+  gfx::Rect launcher_bounds(launcher_->GetWindowScreenBounds());

[sky, 2011/12/14 06:23:05]

What was wrong with the old code here? This change seems to assume the launcher
and status have the same height.

[DaveMoore, 2011/12/14 17:03:19]

It was left over from when I had a background in the status as well. I've gone
back to the old code.

On 2011/12/14 06:23:05, sky wrote:

+  int shelf_h = launcher_bounds.height();
+  int shelf_y = y + (max_height_ - shelf_h) / 2;
   target_bounds->status_bounds = gfx::Rect(
       available_bounds.right() - status_bounds.width(),
-      y + (max_height_ - status_bounds.height()) / 2,
-      status_bounds.width(), status_bounds.height());
-  gfx::Rect launcher_bounds(launcher_->GetWindowScreenBounds());
+      shelf_y,
+      status_bounds.width(), shelf_h);
   target_bounds->launcher_bounds = gfx::Rect(
-      available_bounds.x(), y + (max_height_ - launcher_bounds.height()) / 2,
-      available_bounds.width() - status_bounds.width(),
-      launcher_bounds.height());
+      available_bounds.x(), shelf_y,
+      available_bounds.width(),
+      shelf_h);
   if (visible)
     target_bounds->work_area_insets = gfx::Insets(0, 0, max_height_, 0);
 }
 
 void ShelfLayoutManager::AnimateWidgetTo(views::Widget* widget,
                                          const gfx::Rect& target_bounds,
                                          float target_opacity) {
   ui::Layer* layer = GetLayer(widget);
   ui::LayerAnimator::ScopedSettings animation_setter(layer->GetAnimator());
   widget->SetBounds(target_bounds);
   layer->SetOpacity(target_opacity);
 }
 
 void ShelfLayoutManager::OnLayerAnimationEnded(
     const ui::LayerAnimationSequence* sequence) {
   if (!animating_)
     return;
   animating_ = false;
   visible_ = !visible_;
   TargetBounds target_bounds;
   CalculateTargetBounds(visible_, &target_bounds);
   aura::RootWindow::GetInstance()->screen()->set_work_area_insets(
       target_bounds.work_area_insets);
 }
 
 }  // internal
 }  // aura_shell