OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/shelf/shelf_layout_manager.h" | 5 #include "ash/shelf/shelf_layout_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <cstring> | 9 #include <cstring> |
10 #include <string> | 10 #include <string> |
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
851 gfx::Rect(0, 0, | 851 gfx::Rect(0, 0, |
852 shelf_width - status_size.width(), | 852 shelf_width - status_size.width(), |
853 target_bounds->shelf_bounds_in_root.height()), | 853 target_bounds->shelf_bounds_in_root.height()), |
854 gfx::Rect(0, 0, target_bounds->shelf_bounds_in_root.width(), | 854 gfx::Rect(0, 0, target_bounds->shelf_bounds_in_root.width(), |
855 shelf_height - status_size.height()), | 855 shelf_height - status_size.height()), |
856 gfx::Rect(0, 0, target_bounds->shelf_bounds_in_root.width(), | 856 gfx::Rect(0, 0, target_bounds->shelf_bounds_in_root.width(), |
857 shelf_height - status_size.height()), | 857 shelf_height - status_size.height()), |
858 gfx::Rect(0, 0, | 858 gfx::Rect(0, 0, |
859 shelf_width - status_size.width(), | 859 shelf_width - status_size.width(), |
860 target_bounds->shelf_bounds_in_root.height())); | 860 target_bounds->shelf_bounds_in_root.height())); |
| 861 |
| 862 non_shelf_bounds_ = available_bounds; |
| 863 non_shelf_bounds_.Subtract(target_bounds->shelf_bounds_in_root); |
861 } | 864 } |
862 | 865 |
863 void ShelfLayoutManager::UpdateTargetBoundsForGesture( | 866 void ShelfLayoutManager::UpdateTargetBoundsForGesture( |
864 TargetBounds* target_bounds) const { | 867 TargetBounds* target_bounds) const { |
865 CHECK_EQ(GESTURE_DRAG_IN_PROGRESS, gesture_drag_status_); | 868 CHECK_EQ(GESTURE_DRAG_IN_PROGRESS, gesture_drag_status_); |
866 bool horizontal = IsHorizontalAlignment(); | 869 bool horizontal = IsHorizontalAlignment(); |
867 const gfx::Rect& available_bounds(root_window_->bounds()); | 870 const gfx::Rect& available_bounds(root_window_->bounds()); |
868 int resistance_free_region = 0; | 871 int resistance_free_region = 0; |
869 | 872 |
870 if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_HIDDEN && | 873 if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_HIDDEN && |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1186 return false; | 1189 return false; |
1187 } | 1190 } |
1188 if (session_state_delegate->IsUserSessionBlocked() || | 1191 if (session_state_delegate->IsUserSessionBlocked() || |
1189 state_.is_adding_user_screen) { | 1192 state_.is_adding_user_screen) { |
1190 return true; | 1193 return true; |
1191 } | 1194 } |
1192 return false; | 1195 return false; |
1193 } | 1196 } |
1194 | 1197 |
1195 } // namespace ash | 1198 } // namespace ash |
OLD | NEW |