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/common/system/status_area_widget_delegate.h" | 5 #include "ash/common/system/status_area_widget_delegate.h" |
6 | 6 |
7 #include "ash/ash_export.h" | 7 #include "ash/ash_export.h" |
8 #include "ash/common/focus_cycler.h" | 8 #include "ash/common/focus_cycler.h" |
9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
10 #include "ash/common/shelf/shelf_constants.h" | 10 #include "ash/common/shelf/shelf_constants.h" |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 on_edge ? GetTrayConstant(TRAY_PADDING_FROM_EDGE_OF_SHELF) : 0; | 239 on_edge ? GetTrayConstant(TRAY_PADDING_FROM_EDGE_OF_SHELF) : 0; |
240 right_edge = kShelfItemInset; | 240 right_edge = kShelfItemInset; |
241 } else { // SHELF_ALIGNMENT_RIGHT | 241 } else { // SHELF_ALIGNMENT_RIGHT |
242 top_edge = 0; | 242 top_edge = 0; |
243 left_edge = kShelfItemInset; | 243 left_edge = kShelfItemInset; |
244 bottom_edge = | 244 bottom_edge = |
245 on_edge ? GetTrayConstant(TRAY_PADDING_FROM_EDGE_OF_SHELF) : 0; | 245 on_edge ? GetTrayConstant(TRAY_PADDING_FROM_EDGE_OF_SHELF) : 0; |
246 right_edge = shelf_size - kShelfItemInset - item_height; | 246 right_edge = shelf_size - kShelfItemInset - item_height; |
247 } | 247 } |
248 } | 248 } |
249 child->SetBorder(views::Border::CreateEmptyBorder(top_edge, left_edge, | 249 child->SetBorder( |
250 bottom_edge, right_edge)); | 250 views::CreateEmptyBorder(top_edge, left_edge, bottom_edge, right_edge)); |
251 // Layout on |child| needs to be updated based on new border value before | 251 // Layout on |child| needs to be updated based on new border value before |
252 // displaying; otherwise |child| will be showing with old border size. | 252 // displaying; otherwise |child| will be showing with old border size. |
253 // Fix for crbug.com/623438. | 253 // Fix for crbug.com/623438. |
254 child->Layout(); | 254 child->Layout(); |
255 } | 255 } |
256 | 256 |
257 } // namespace ash | 257 } // namespace ash |
OLD | NEW |