OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/aura_shell/desktop_layout_manager.h" | 5 #include "ui/aura_shell/desktop_layout_manager.h" |
6 | 6 |
7 #include "ui/aura/window.h" | 7 #include "ui/aura/window.h" |
8 #include "views/widget/widget.h" | 8 #include "views/widget/widget.h" |
9 | 9 |
10 namespace aura_shell { | 10 namespace aura_shell { |
(...skipping 18 matching lines...) Expand all Loading... |
29 void DesktopLayoutManager::OnWindowResized() { | 29 void DesktopLayoutManager::OnWindowResized() { |
30 gfx::Rect fullscreen_bounds = | 30 gfx::Rect fullscreen_bounds = |
31 gfx::Rect(owner_->bounds().width(), owner_->bounds().height()); | 31 gfx::Rect(owner_->bounds().width(), owner_->bounds().height()); |
32 | 32 |
33 aura::Window::Windows::const_iterator i; | 33 aura::Window::Windows::const_iterator i; |
34 for (i = owner_->children().begin(); i != owner_->children().end(); ++i) | 34 for (i = owner_->children().begin(); i != owner_->children().end(); ++i) |
35 (*i)->SetBounds(fullscreen_bounds); | 35 (*i)->SetBounds(fullscreen_bounds); |
36 | 36 |
37 background_widget_->SetBounds(fullscreen_bounds); | 37 background_widget_->SetBounds(fullscreen_bounds); |
38 | 38 |
39 gfx::Rect launcher_bounds = launcher_widget_->GetWindowScreenBounds(); | |
40 launcher_widget_->SetBounds( | |
41 gfx::Rect(0, owner_->bounds().bottom() - launcher_bounds.height(), | |
42 launcher_bounds.width(), | |
43 launcher_bounds.height())); | |
44 | |
45 gfx::Rect status_area_bounds = status_area_widget_->GetWindowScreenBounds(); | 39 gfx::Rect status_area_bounds = status_area_widget_->GetWindowScreenBounds(); |
46 status_area_widget_->SetBounds( | 40 status_area_widget_->SetBounds( |
47 gfx::Rect(owner_->bounds().right() - status_area_bounds.width(), | 41 gfx::Rect(owner_->bounds().right() - status_area_bounds.width(), |
48 owner_->bounds().bottom() - status_area_bounds.height(), | 42 owner_->bounds().bottom() - status_area_bounds.height(), |
49 status_area_bounds.width(), | 43 status_area_bounds.width(), |
50 status_area_bounds.height())); | 44 status_area_bounds.height())); |
| 45 |
| 46 // Give the launcher the available width minus the status area. |
| 47 gfx::Rect launcher_bounds = launcher_widget_->GetWindowScreenBounds(); |
| 48 launcher_widget_->SetBounds( |
| 49 gfx::Rect(0, owner_->bounds().bottom() - launcher_bounds.height(), |
| 50 owner_->bounds().width() - status_area_bounds.width(), |
| 51 launcher_bounds.height())); |
51 } | 52 } |
52 | 53 |
53 } // namespace internal | 54 } // namespace internal |
54 } // namespace aura_shell | 55 } // namespace aura_shell |
OLD | NEW |