Drag and rotate windows

ui/aura_shell/default_container_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/default_container_layout_manager.h"
 
 #include "base/auto_reset.h"
 #include "ui/aura/desktop.h"
+#include "ui/aura/event.h"
 #include "ui/aura/window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window_types.h"
 #include "ui/aura_shell/workspace/workspace.h"
 #include "ui/aura_shell/workspace/workspace_manager.h"
 #include "ui/base/view_prop.h"
 #include "ui/gfx/rect.h"
 #include "views/widget/native_widget_aura.h"
 
 namespace aura_shell {
@@ skipping 18 matching lines @@
     aura::MouseEvent* event) {
   drag_window_ = drag;
 }
 
 void DefaultContainerLayoutManager::CancelMoveOrResize(
     aura::Window* drag,
     aura::MouseEvent* event) {
   drag_window_ = NULL;
 }
 
+void DefaultContainerLayoutManager::ProcessMove(
+    aura::Window* drag,
+    aura::MouseEvent* event) {
+  AutoReset<bool> reset(&ignore_calculate_bounds_, true);
+
+  // TODO(oshima): Just zooming out may (and will) move/swap window without
+  // a users's intent. We probably should scroll viewport, but that may not
+  // be enough. See crbug.com/101826 for more discussion.
+  workspace_manager_->SetOverview(true);
+
+  gfx::Point point_in_owner = event->location();
+  aura::Window::ConvertPointToWindow(
+      drag,
+      owner_,
+      &point_in_owner);
+
+  aura::Window* swap_target =
+      workspace_manager_->FindSwapWindowForLocation(point_in_owner);
+  if (swap_target)
+    workspace_manager_->SwapWindow(drag, swap_target);

[sky, 2011/10/27 00:53:03]

Don't we want to move rather than swapping?

[oshima, 2011/10/27 16:16:27]

You're right. we want move (or rotate). I'll fix asap.

+}
+
 void DefaultContainerLayoutManager::EndMove(
     aura::Window* drag,
     aura::MouseEvent* evnet) {
   // TODO(oshima): finish moving window between workspaces.
   AutoReset<bool> reset(&ignore_calculate_bounds_, true);
   drag_window_ = NULL;
   Workspace* workspace = workspace_manager_->GetActiveWorkspace();
   if (workspace)
-    workspace->Layout(NULL);
+    workspace->Layout(NULL, NULL);
+  workspace_manager_->SetOverview(false);
 }
 
 void DefaultContainerLayoutManager::EndResize(
     aura::Window* drag,
     aura::MouseEvent* evnet) {
   AutoReset<bool> reset(&ignore_calculate_bounds_, true);
   drag_window_ = NULL;
   Workspace* workspace = workspace_manager_->GetActiveWorkspace();
   if (workspace)
-    workspace->Layout(NULL);
+    workspace->Layout(NULL, NULL);
+  workspace_manager_->SetOverview(false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DefaultContainerLayoutManager, aura::LayoutManager implementation:
 
 void DefaultContainerLayoutManager::OnWindowResized() {
   // Workspace is updated via DesktopObserver::OnDesktopResized.
 }
 
 void DefaultContainerLayoutManager::OnWindowAdded(aura::Window* child) {
@@ skipping 55 matching lines @@
 
   Workspace* workspace = workspace_manager_->FindBy(child);
   gfx::Rect work_area = workspace->GetWorkAreaBounds();
   requested_bounds->set_origin(
       gfx::Point(child->GetTargetBounds().x(), work_area.y()));
   *requested_bounds = requested_bounds->AdjustToFit(work_area);
 }
 
 }  // namespace internal
 }  // namespace aura_shell