Dont allow the user to 'resize a window out of the workarea'

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/property_util.h"
 #include "ash/wm/window_util.h"
@@ skipping 82 matching lines @@
 // static
 const int WindowResizer::kBoundsChange_Resizes = 2;
 
 // static
 const int WindowResizer::kBoundsChangeDirection_None = 0;
 // static
 const int WindowResizer::kBoundsChangeDirection_Horizontal = 1;
 // static
 const int WindowResizer::kBoundsChangeDirection_Vertical = 2;
 
+// static
+const int WindowResizer::kMinimumOnScreenSize = 10;
+
 WindowResizer::Details::Details()
     : window(NULL),
       window_component(HTNOWHERE),
       bounds_change(0),
       position_change_direction(0),
       size_change_direction(0),
       is_resizable(false) {
 }
 
 WindowResizer::Details::Details(aura::Window* window,
@@ skipping 49 matching lines @@
       break;
     default:
       break;
   }
   return bounds_change;
 }
 
 // static
 gfx::Rect WindowResizer::CalculateBoundsForDrag(
     const Details& details,
-    const gfx::Point& location) {
+    const gfx::Point& passed_location) {
   if (!details.is_resizable)
     return details.initial_bounds;
 
+  gfx::Point location = passed_location;
+  gfx::Rect work_area =

[sky, 2012/10/09 23:58:53]

Move work_area inside if.

[Mr4D (OOO till 08-26), 2012/10/10 23:14:35]

cannot since it's being used in line 233 as well.

+      ScreenAsh::GetDisplayWorkAreaBoundsInParent(details.window);
+
+  // Don't allow the user to "resize a window" out of the screen.
+  if (details.bounds_change & kBoundsChange_Resizes) {
+    if (details.size_change_direction & kBoundsChangeDirection_Horizontal) {
+      if (IsRightEdge(details.window_component)) {
+        location.set_x(
+            std::max(location.x(),
+                     work_area.x() + WindowResizer::kMinimumOnScreenSize));
+      } else {
+        location.set_x(
+            std::min(location.x(),
+                     work_area.right() - WindowResizer::kMinimumOnScreenSize));
+      }
+    }
+    if (details.size_change_direction & kBoundsChangeDirection_Vertical) {
+      if (!IsBottomEdge(details.window_component)) {
+        location.set_y(
+            std::min(location.y(), work_area.bottom() -
+                                   WindowResizer::kMinimumOnScreenSize));
+      }
+    }
+  }
+
   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);
 
   // When we might want to reposition a window which is also restored to its
   // previous size, to keep the cursor within the dragged window.
   if (!details.restore_bounds.IsEmpty() &&
       details.bounds_change & kBoundsChange_Repositions) {
     // However - it is not desirable to change the origin if the window would
     // be still hit by the cursor.
     if (details.initial_location_in_parent.x() >
             details.initial_bounds.x() + details.restore_bounds.width())
       origin.set_x(location.x() - details.restore_bounds.width() / 2);
   }
 
   gfx::Rect new_bounds(origin, size);
   // Update bottom edge to stay in the work area when we are resizing
-  // by dragging the bottome edge or corners.
+  // by dragging the bottom edge or corners.
   if (details.window_component == HTBOTTOM ||
       details.window_component == HTBOTTOMRIGHT ||
       details.window_component == HTBOTTOMLEFT) {
-    gfx::Rect work_area =
-        ScreenAsh::GetDisplayWorkAreaBoundsInParent(details.window);
     if (new_bounds.bottom() > work_area.bottom())
       new_bounds.Inset(0, 0, 0,
                        new_bounds.bottom() - work_area.bottom());
   }
   if (details.bounds_change & kBoundsChange_Resizes &&
       details.bounds_change & kBoundsChange_Repositions && new_bounds.y() < 0) {
     int delta = new_bounds.y();
     new_bounds.set_y(0);
     new_bounds.set_height(new_bounds.height() + delta);
   }
+
   return new_bounds;
 }
 
 // static
 bool WindowResizer::IsBottomEdge(int window_component) {
   return window_component == HTBOTTOMLEFT ||
       window_component == HTBOTTOM ||
       window_component == HTBOTTOMRIGHT ||
       window_component == HTGROWBOX;
 }
@@ skipping 79 matching lines @@
         gfx::Screen::GetDisplayNearestWindow(details.window).bounds().height();
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier * (details.initial_bounds.height() - max_height);
     }
   }
   return height;
 }
 
 }  // namespace aura