Make sure that 30%of restored window is always visible.

ash/wm/window_util.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_util.h"
 
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/root_window_controller.h"
@@ skipping 153 matching lines @@
 void AdjustBoundsToEnsureMinimumWindowVisibility(const gfx::Rect& work_area,
                                                  gfx::Rect* bounds) {
   AdjustBoundsToEnsureWindowVisibility(
       work_area, kMinimumOnScreenArea, kMinimumOnScreenArea, bounds);
 }
 
 void AdjustBoundsToEnsureWindowVisibility(const gfx::Rect& work_area,
                                           int min_width,
                                           int min_height,
                                           gfx::Rect* bounds) {
   bounds->set_width(std::min(bounds->width(), work_area.width()));

[Mr4D (OOO till 08-26), 2013/08/06 20:22:51]

I assume this is not really a problem - but what is if the new width is smaller
then min_width? Shouldn't this min include the std::max(min_width,
std::min(...))?

[oshima, 2013/08/06 23:13:20]

min_width/min_height shouldn't be bigger than wrok_area so
I added that condition. (plus test)

   bounds->set_height(std::min(bounds->height(), work_area.height()));
-  if (!work_area.Intersects(*bounds)) {
-    int y_offset = 0;
-    if (work_area.bottom() < bounds->y()) {
-      y_offset = work_area.bottom() - bounds->y() - min_height;
-    } else if (bounds->bottom() < work_area.y()) {
-      y_offset = work_area.y() - bounds->bottom() + min_height;
-    }
 
-    int x_offset = 0;
-    if (work_area.right() < bounds->x()) {
-      x_offset = work_area.right() - bounds->x() - min_width;
-    } else if (bounds->right() < work_area.x()) {
-      x_offset = work_area.x() - bounds->right() + min_width;
-    }
-    bounds->Offset(x_offset, y_offset);
+  if (bounds->x() + min_width > work_area.right()) {
+    bounds->set_x(work_area.right() - min_width);
+  } else if (bounds->right() - min_width < 0) {
+      bounds->set_x(min_width - bounds->width());

[Mr4D (OOO till 08-26), 2013/08/06 20:22:51]

Indenting incorrect.

[oshima, 2013/08/06 23:13:20]

Done.

+  }
+  if (bounds->y() + min_height > work_area.height()) {

[Mr4D (OOO till 08-26), 2013/08/06 20:22:51]

work_Area.height is probably not correct. Shouldn't it be ".bottom()" ? With the
shelf alignment this could be otherwise correct or wrong.

[oshima, 2013/08/06 23:13:20]

You're right. fixed.

+    bounds->set_y(work_area.bottom() - min_height);
+  } else if (bounds->bottom() - min_height < 0) {
+    bounds->set_y(min_height - bounds->height());
   }
 }
 
 bool MoveWindowToEventRoot(aura::Window* window, const ui::Event& event) {
   views::View* target = static_cast<views::View*>(event.target());
   if (!target)
     return false;
   aura::RootWindow* target_root =
       target->GetWidget()->GetNativeView()->GetRootWindow();
   if (!target_root || target_root == window->GetRootWindow())
     return false;
   aura::Window* window_container =
       ash::Shell::GetContainer(target_root, window->parent()->id());
   // Move the window to the target launcher.
   window_container->AddChild(window);
   return true;
 }
 
 }  // namespace wm
 }  // namespace ash