Stick windows to sides of workspaces

ash/wm/window_resizer.cc

 // Copyright (c) 2012 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/window_resizer.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
+#include "ash/wm/dock/dock_edge_types.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/display.h"
@@ skipping 150 matching lines @@
 
 // static
 gfx::Rect WindowResizer::CalculateBoundsForDrag(
     const Details& details,
     const gfx::Point& passed_location) {
   if (!details.is_resizable)
     return details.initial_bounds_in_parent;
 
   gfx::Point location = passed_location;
   gfx::Rect work_area =
-      ScreenAsh::GetDisplayWorkAreaBoundsInParent(details.window);
+      (GetDockEdges(details.window) == DOCK_EDGE_NONE) ?
+          ScreenAsh::GetDisplayWorkAreaBoundsInParent(details.window) :
+          ScreenAsh::GetDisplayBoundsInParent(details.window);
 
   int delta_x = location.x() - details.initial_location_in_parent.x();
   int delta_y = location.y() - details.initial_location_in_parent.y();
 
   // The minimize size constraint may limit how much we change the window
   // position.  For example, dragging the left edge to the right should stop
   // repositioning the window when the minimize size is reached.
   gfx::Size size = GetSizeForDrag(details, &delta_x, &delta_y);
   gfx::Point origin = GetOriginForDrag(details, delta_x, delta_y);
   gfx::Rect new_bounds(origin, size);
@@ skipping 51 matching lines @@
     }
 
     // Make sure that |new_bounds| doesn't leave any of the displays.  Note that
     // the |work_area| above isn't good for this check since it is the work area
     // for the current display but the window can move to a different one.
     aura::Window* parent = details.window->parent();
     gfx::Rect new_bounds_in_screen =
         ScreenAsh::ConvertRectToScreen(parent, new_bounds);
     const gfx::Display& display =
         Shell::GetScreen()->GetDisplayMatching(new_bounds_in_screen);
-    gfx::Rect screen_work_area = display.work_area();
+    gfx::Rect screen_work_area;
+    if (GetDockEdges(details.window) == DOCK_EDGE_NONE)
+      screen_work_area = display.work_area();
+    else
+      screen_work_area = display.bounds();
     screen_work_area.Inset(kMinimumOnScreenArea, 0);
     if (!screen_work_area.Intersects(new_bounds_in_screen)) {
       // Make sure that the x origin does not leave the current display.
       new_bounds_in_screen.set_x(
           std::max(screen_work_area.x() - new_bounds.width(),
                    std::min(screen_work_area.right(),
                             new_bounds_in_screen.x())));
       new_bounds =
           ScreenAsh::ConvertRectFromScreen(parent, new_bounds_in_screen);
     }
@@ skipping 101 matching lines @@
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier * (details.initial_bounds_in_parent.height() -
                                   max_height);
     }
   }
   return height;
 }
 
 }  // namespace aura