Implement automatic layout and stacking for docked windows

ash/wm/dock/docked_window_resizer.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/wm/dock/docked_window_resizer.h"
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
@@ skipping 156 matching lines @@
   bool can_snap = was_docked_ ||
       internal::DockedWindowLayoutManager::ShouldWindowDock(GetTarget(),
                                                             last_location_);
   if (!can_snap)
     return false;
 
   if (dock_alignment == internal::DOCKED_ALIGNMENT_LEFT ||
       (dock_alignment == internal::DOCKED_ALIGNMENT_NONE && was_docked_)) {
     const int distance = bounds.x() - dock_bounds.x();
     if (distance < kSnapToDockDistance && distance > -kStickyDistance) {
-      offset->set_x(dock_bounds.x() - bounds.x());
+      offset->set_x(-distance);
       return true;
     }
   }
   if (dock_alignment == internal::DOCKED_ALIGNMENT_RIGHT ||
       (dock_alignment == internal::DOCKED_ALIGNMENT_NONE && was_docked_)) {
     const int distance = dock_bounds.right() - bounds.right();
     if (distance < kSnapToDockDistance && distance > -kStickyDistance) {
-      offset->set_x(dock_bounds.right() - bounds.right());
+      offset->set_x(distance);
       return true;
     }
   }
   return false;
 }
 
 void DockedWindowResizer::StartedDragging() {
   // Tell the dock layout manager that we are dragging this window.
   dock_layout_->StartDragging(GetTarget());
 }
@@ skipping 10 matching lines @@
           switches::kAshEnableDockedWindows)) {
     should_dock = internal::DockedWindowLayoutManager::ShouldWindowDock(
         window, last_location_);
   }
 
   // Check if desired docked state is not same as current.
   // If not same dock or undock accordingly.
   if (should_dock !=
       (window->parent()->id() == internal::kShellWindowId_DockedContainer)) {
     if (should_dock) {
+      // Panel resizer might have attached this to the launcher.
+      // Docked resizer takes priority and may attach it to the docked area.
+      if (window->type() == aura::client::WINDOW_TYPE_PANEL)
+        window->SetProperty(internal::kPanelAttachedKey, false);

[flackr, 2013/07/16 22:05:45]

Separate CL please.

[varkha, 2013/07/18 21:56:59]

Done.

       aura::Window* dock_container = Shell::GetContainer(
           window->GetRootWindow(),
           internal::kShellWindowId_DockedContainer);
       dock_container->AddChild(window);
     } else {
       // Reparent the window back to workspace.
       // We need to be careful to give SetDefaultParentByRootWindow location in
       // the right root window (matching the logic in DragWindowResizer) based
       // on which root window a mouse pointer is in. We want to undock into the
       // right screen near the edge of a multiscreen setup (based on where the
       // mouse is).
       gfx::Rect near_last_location(last_location_, gfx::Size());
       // Reparenting will cause Relayout and possible dock shrinking.
       window->SetDefaultParentByRootWindow(window->GetRootWindow(),
                                            near_last_location);
       // A maximized workspace may be active so we may need to switch
       // to a parent workspace of the window being dragged out.
       internal::WorkspaceController* workspace_controller =
           GetRootWindowController(
               window->GetRootWindow())->workspace_controller();
       workspace_controller->SetActiveWorkspaceByWindow(window);
     }
   }
   dock_layout_->FinishDragging();
 }
 
 }  // namespace aura