Stick windows to sides of workspaces

ash/shelf/shelf_layout_manager.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/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/ash_switches.h"
@@ skipping 717 matching lines @@
 
   // Also push in the work area inset for the keyboard if it is visible.
   if (!keyboard_bounds_.IsEmpty()) {
     target_bounds->work_area_insets.Set(
         target_bounds->work_area_insets.top(),
         target_bounds->work_area_insets.left(),
         target_bounds->work_area_insets.bottom() + keyboard_bounds_.height(),
         target_bounds->work_area_insets.right());
   }
 
+  // Also push in the work area inset for the dock if it is visible.

[flackr, 2013/05/31 14:23:45]

It seems odd that the shelf layout manager is responsible for managing the work
area insets based on itself, the keyboard and the dock. Long term this
management should probably be moved to a more generic place where something
observes changes to each component which can affect the work space. Can you
leave a TODO to this effect?

[varkha, 2013/05/31 23:33:42]

Done.

+  if (!dock_bounds_.IsEmpty()) {
+    int left_inset = dock_bounds_.x() > 0 ? dock_bounds_.width() : 0;
+    int right_inset = dock_bounds_.x() > 0 ? 0 : dock_bounds_.width();
+    target_bounds->work_area_insets.Set(

[flackr, 2013/05/31 14:23:45]

the +=(Insets) operator would probably look nicer.

[varkha, 2013/05/31 23:33:42]

Done.

+        target_bounds->work_area_insets.top(),
+        target_bounds->work_area_insets.left() + left_inset,
+        target_bounds->work_area_insets.bottom(),
+        target_bounds->work_area_insets.right() + right_inset);
+  }
+
   target_bounds->opacity =
       (gesture_drag_status_ != GESTURE_DRAG_NONE ||
        state.visibility_state == SHELF_VISIBLE ||
        state.visibility_state == SHELF_AUTO_HIDE) ? 1.0f : 0.0f;
 
   if (gesture_drag_status_ == GESTURE_DRAG_IN_PROGRESS)
     UpdateTargetBoundsForGesture(target_bounds);
 
   // This needs to happen after calling UpdateTargetBoundsForGesture(), because
   // that can change the size of the shelf.
@@ skipping 204 matching lines @@
   bounds.set_height(bounds.height() - keyboard_bounds_.height());
   return bounds;
 }
 
 void ShelfLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& keyboard_bounds) {
   keyboard_bounds_ = keyboard_bounds;
   OnWindowResized();
 }
 
+void ShelfLayoutManager::OnDockBoundsChanging(
+    const gfx::Rect& dock_bounds) {
+  LOG(INFO) << "OnDockBoundsChanging - (" <<
+      dock_bounds.x() << "," << dock_bounds.y() << ") (" <<
+      dock_bounds.width() << "x" << dock_bounds.height() << ")";
+  dock_bounds_ = dock_bounds;
+  OnWindowResized();
+}
+
 gfx::Insets ShelfLayoutManager::GetInsetsForAlignment(int distance) const {
   switch (alignment_) {
     case SHELF_ALIGNMENT_BOTTOM:
       return gfx::Insets(distance, 0, 0, 0);
     case SHELF_ALIGNMENT_LEFT:
       return gfx::Insets(0, 0, 0, distance);
     case SHELF_ALIGNMENT_RIGHT:
       return gfx::Insets(0, distance, 0, 0);
     case SHELF_ALIGNMENT_TOP:
       return gfx::Insets(0, 0, distance, 0);
   }
   NOTREACHED();
   return gfx::Insets();
 }
 
 }  // namespace internal
 }  // namespace ash