OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/wm/overview/window_selector_panels.h" | 5 #include "ash/wm/overview/window_selector_panels.h" |
6 | 6 |
7 #include "ash/screen_util.h" | 7 #include "ash/screen_util.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
10 #include "ash/wm/overview/scoped_transform_overview_window.h" | 10 #include "ash/wm/overview/scoped_transform_overview_window.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
85 : panels_root_window_(panels_root_window) { | 85 : panels_root_window_(panels_root_window) { |
86 static_cast<PanelLayoutManager*>( | 86 static_cast<PanelLayoutManager*>( |
87 Shell::GetContainer(panels_root_window_, kShellWindowId_PanelContainer)-> | 87 Shell::GetContainer(panels_root_window_, kShellWindowId_PanelContainer)-> |
88 layout_manager())->SetShowCalloutWidgets(false); | 88 layout_manager())->SetShowCalloutWidgets(false); |
89 } | 89 } |
90 | 90 |
91 WindowSelectorPanels::~WindowSelectorPanels() { | 91 WindowSelectorPanels::~WindowSelectorPanels() { |
92 static_cast<PanelLayoutManager*>( | 92 static_cast<PanelLayoutManager*>( |
93 Shell::GetContainer(panels_root_window_, kShellWindowId_PanelContainer)-> | 93 Shell::GetContainer(panels_root_window_, kShellWindowId_PanelContainer)-> |
94 layout_manager())->SetShowCalloutWidgets(true); | 94 layout_manager())->SetShowCalloutWidgets(true); |
95 if (!transform_windows_.empty()) | |
96 transform_windows_[0]->window()->RemoveObserver(this); | |
95 } | 97 } |
96 | 98 |
97 void WindowSelectorPanels::AddWindow(aura::Window* window) { | 99 void WindowSelectorPanels::AddWindow(aura::Window* window) { |
98 DCHECK(window->GetRootWindow() == panels_root_window_); | 100 DCHECK(window->GetRootWindow() == panels_root_window_); |
101 // If this is the panel we use to get the label text, observe it for changes. | |
102 if (transform_windows_.empty()) | |
103 window->AddObserver(this); | |
99 transform_windows_.push_back(new ScopedTransformPanelWindow(window)); | 104 transform_windows_.push_back(new ScopedTransformPanelWindow(window)); |
100 } | 105 } |
101 | 106 |
102 aura::Window* WindowSelectorPanels::GetRootWindow() { | 107 aura::Window* WindowSelectorPanels::GetRootWindow() { |
103 return transform_windows_.front()->window()->GetRootWindow(); | 108 return transform_windows_.front()->window()->GetRootWindow(); |
104 } | 109 } |
105 | 110 |
106 bool WindowSelectorPanels::HasSelectableWindow(const aura::Window* window) { | 111 bool WindowSelectorPanels::HasSelectableWindow(const aura::Window* window) { |
107 for (WindowList::const_iterator iter = transform_windows_.begin(); | 112 for (WindowList::const_iterator iter = transform_windows_.begin(); |
108 iter != transform_windows_.end(); ++iter) { | 113 iter != transform_windows_.end(); ++iter) { |
(...skipping 23 matching lines...) Expand all Loading... | |
132 } | 137 } |
133 | 138 |
134 aura::Window* WindowSelectorPanels::SelectionWindow() { | 139 aura::Window* WindowSelectorPanels::SelectionWindow() { |
135 return transform_windows_.front()->window(); | 140 return transform_windows_.front()->window(); |
136 } | 141 } |
137 | 142 |
138 void WindowSelectorPanels::RemoveWindow(const aura::Window* window) { | 143 void WindowSelectorPanels::RemoveWindow(const aura::Window* window) { |
139 for (WindowList::iterator iter = transform_windows_.begin(); | 144 for (WindowList::iterator iter = transform_windows_.begin(); |
140 iter != transform_windows_.end(); ++iter) { | 145 iter != transform_windows_.end(); ++iter) { |
141 if ((*iter)->window() == window) { | 146 if ((*iter)->window() == window) { |
147 if (window == transform_windows_[0]->window()) { | |
tdanderson
2014/06/20 22:33:23
Brief comment to explain what you're doing in line
Nina
2014/06/20 23:02:37
Done.
| |
148 transform_windows_[0]->window()->RemoveObserver(this); | |
149 if (transform_windows_.size() > 1) | |
150 transform_windows_[1]->window()->AddObserver(this); | |
151 } | |
142 (*iter)->OnWindowDestroyed(); | 152 (*iter)->OnWindowDestroyed(); |
143 transform_windows_.erase(iter); | 153 transform_windows_.erase(iter); |
144 break; | 154 break; |
145 } | 155 } |
146 } | 156 } |
147 WindowSelectorItem::RemoveWindow(window); | 157 WindowSelectorItem::RemoveWindow(window); |
148 } | 158 } |
149 | 159 |
150 bool WindowSelectorPanels::empty() const { | 160 bool WindowSelectorPanels::empty() const { |
151 return transform_windows_.empty(); | 161 return transform_windows_.empty(); |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
193 transform.Translate(bounding_rect.x() - bounds.x(), | 203 transform.Translate(bounding_rect.x() - bounds.x(), |
194 bounding_rect.y() - bounds.y()); | 204 bounding_rect.y() - bounds.y()); |
195 transform.PreconcatTransform(bounding_transform); | 205 transform.PreconcatTransform(bounding_transform); |
196 transform.Translate(bounds.x() - bounding_rect.x(), | 206 transform.Translate(bounds.x() - bounding_rect.x(), |
197 bounds.y() - bounding_rect.y()); | 207 bounds.y() - bounding_rect.y()); |
198 (*iter)->SetTransform(root_window, transform, animate); | 208 (*iter)->SetTransform(root_window, transform, animate); |
199 } | 209 } |
200 } | 210 } |
201 | 211 |
202 } // namespace ash | 212 } // namespace ash |
OLD | NEW |