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/modal_container_layout_manager.h" | 5 #include "ui/aura_shell/modal_container_layout_manager.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "ui/aura/client/aura_constants.h" | 8 #include "ui/aura/client/aura_constants.h" |
9 #include "ui/aura/event.h" | 9 #include "ui/aura/event.h" |
10 #include "ui/aura/root_window.h" | 10 #include "ui/aura/root_window.h" |
11 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
12 #include "ui/aura_shell/modality_event_filter.h" | 12 #include "ui/aura_shell/modality_event_filter.h" |
13 #include "ui/aura_shell/shell.h" | 13 #include "ui/aura_shell/shell.h" |
14 #include "ui/aura_shell/stacking_controller.h" | 14 #include "ui/aura_shell/window_util.h" |
15 #include "ui/gfx/canvas.h" | 15 #include "ui/gfx/canvas.h" |
16 #include "ui/gfx/compositor/layer.h" | 16 #include "ui/gfx/compositor/layer.h" |
17 #include "ui/gfx/compositor/layer_animator.h" | 17 #include "ui/gfx/compositor/layer_animator.h" |
18 #include "ui/views/view.h" | 18 #include "ui/views/view.h" |
19 #include "ui/views/widget/widget.h" | 19 #include "ui/views/widget/widget.h" |
20 | 20 |
21 namespace aura_shell { | 21 namespace aura_shell { |
22 namespace internal { | 22 namespace internal { |
23 | 23 |
24 namespace { | 24 namespace { |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 | 119 |
120 void ModalContainerLayoutManager::OnLayerAnimationScheduled( | 120 void ModalContainerLayoutManager::OnLayerAnimationScheduled( |
121 const ui::LayerAnimationSequence* sequence) { | 121 const ui::LayerAnimationSequence* sequence) { |
122 } | 122 } |
123 | 123 |
124 //////////////////////////////////////////////////////////////////////////////// | 124 //////////////////////////////////////////////////////////////////////////////// |
125 // ModalContainerLayoutManager, ModalityEventFilter::Delegate implementation: | 125 // ModalContainerLayoutManager, ModalityEventFilter::Delegate implementation: |
126 | 126 |
127 bool ModalContainerLayoutManager::CanWindowReceiveEvents( | 127 bool ModalContainerLayoutManager::CanWindowReceiveEvents( |
128 aura::Window* window) { | 128 aura::Window* window) { |
129 return StackingController::GetActivatableWindow(window) == modal_window(); | 129 return GetActivatableWindow(window) == modal_window(); |
130 } | 130 } |
131 | 131 |
132 //////////////////////////////////////////////////////////////////////////////// | 132 //////////////////////////////////////////////////////////////////////////////// |
133 // ModalContainerLayoutManager, private: | 133 // ModalContainerLayoutManager, private: |
134 | 134 |
135 void ModalContainerLayoutManager::AddModalWindow(aura::Window* window) { | 135 void ModalContainerLayoutManager::AddModalWindow(aura::Window* window) { |
136 modal_windows_.push_back(window); | 136 modal_windows_.push_back(window); |
137 CreateModalScreen(); | 137 CreateModalScreen(); |
138 container_->StackChildAtTop(window); | |
139 window->Activate(); | |
140 } | 138 } |
141 | 139 |
142 void ModalContainerLayoutManager::RemoveModalWindow(aura::Window* window) { | 140 void ModalContainerLayoutManager::RemoveModalWindow(aura::Window* window) { |
143 aura::Window::Windows::iterator it = | 141 aura::Window::Windows::iterator it = |
144 std::find(modal_windows_.begin(), modal_windows_.end(), window); | 142 std::find(modal_windows_.begin(), modal_windows_.end(), window); |
145 if (it != modal_windows_.end()) | 143 if (it != modal_windows_.end()) |
146 modal_windows_.erase(it); | 144 modal_windows_.erase(it); |
147 | 145 |
148 if (modal_windows_.empty()) | 146 if (modal_windows_.empty()) |
149 HideModalScreen(); | 147 HideModalScreen(); |
150 else | 148 else |
151 modal_window()->Activate(); | 149 aura_shell::ActivateWindow(modal_window()); |
152 } | 150 } |
153 | 151 |
154 void ModalContainerLayoutManager::CreateModalScreen() { | 152 void ModalContainerLayoutManager::CreateModalScreen() { |
155 if (modal_screen_) | 153 if (modal_screen_) |
156 return; | 154 return; |
157 modal_screen_ = new views::Widget; | 155 modal_screen_ = new views::Widget; |
158 views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL); | 156 views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL); |
159 params.parent = container_; | 157 params.parent = container_; |
160 params.bounds = gfx::Rect(0, 0, container_->bounds().width(), | 158 params.bounds = gfx::Rect(0, 0, container_->bounds().width(), |
161 container_->bounds().height()); | 159 container_->bounds().height()); |
(...skipping 21 matching lines...) Expand all Loading... |
183 | 181 |
184 void ModalContainerLayoutManager::HideModalScreen() { | 182 void ModalContainerLayoutManager::HideModalScreen() { |
185 Shell::GetInstance()->RemoveRootWindowEventFilter(modality_filter_.get()); | 183 Shell::GetInstance()->RemoveRootWindowEventFilter(modality_filter_.get()); |
186 ui::LayerAnimator::ScopedSettings settings( | 184 ui::LayerAnimator::ScopedSettings settings( |
187 modal_screen_->GetNativeView()->layer()->GetAnimator()); | 185 modal_screen_->GetNativeView()->layer()->GetAnimator()); |
188 modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f); | 186 modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f); |
189 } | 187 } |
190 | 188 |
191 } // namespace internal | 189 } // namespace internal |
192 } // namespace aura_shell | 190 } // namespace aura_shell |
OLD | NEW |