Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: ash/common/wm/window_cycle_list.cc

Issue 2639203007: Update SetPaintToLayer to accept LayerType (Closed)
Patch Set: Refactor Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/wm/window_cycle_list.h" 5 #include "ash/common/wm/window_cycle_list.h"
6 6
7 #include <list> 7 #include <list>
8 #include <map> 8 #include <map>
9 9
10 #include "ash/common/wm/mru_window_tracker.h" 10 #include "ash/common/wm/mru_window_tracker.h"
11 #include "ash/common/wm/window_state.h" 11 #include "ash/common/wm/window_state.h"
12 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
13 #include "ash/common/wm_window.h" 13 #include "ash/common/wm_window.h"
14 #include "ash/public/cpp/shell_window_ids.h" 14 #include "ash/public/cpp/shell_window_ids.h"
15 #include "ash/root_window_controller.h" 15 #include "ash/root_window_controller.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "ui/accessibility/ax_node_data.h" 17 #include "ui/accessibility/ax_node_data.h"
18 #include "ui/compositor/layer_type.h"
18 #include "ui/compositor/scoped_layer_animation_settings.h" 19 #include "ui/compositor/scoped_layer_animation_settings.h"
19 #include "ui/display/display.h" 20 #include "ui/display/display.h"
20 #include "ui/display/screen.h" 21 #include "ui/display/screen.h"
21 #include "ui/gfx/canvas.h" 22 #include "ui/gfx/canvas.h"
22 #include "ui/views/background.h" 23 #include "ui/views/background.h"
23 #include "ui/views/border.h" 24 #include "ui/views/border.h"
24 #include "ui/views/controls/label.h" 25 #include "ui/views/controls/label.h"
25 #include "ui/views/layout/box_layout.h" 26 #include "ui/views/layout/box_layout.h"
26 #include "ui/views/painter.h" 27 #include "ui/views/painter.h"
27 #include "ui/views/view.h" 28 #include "ui/views/view.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 }; 207 };
207 208
208 // A view that shows a collection of windows the user can tab through. 209 // A view that shows a collection of windows the user can tab through.
209 class WindowCycleView : public views::WidgetDelegateView { 210 class WindowCycleView : public views::WidgetDelegateView {
210 public: 211 public:
211 explicit WindowCycleView(const WindowCycleList::WindowList& windows) 212 explicit WindowCycleView(const WindowCycleList::WindowList& windows)
212 : mirror_container_(new views::View()), 213 : mirror_container_(new views::View()),
213 highlight_view_(new views::View()), 214 highlight_view_(new views::View()),
214 target_window_(nullptr) { 215 target_window_(nullptr) {
215 DCHECK(!windows.empty()); 216 DCHECK(!windows.empty());
216 SetPaintToLayer(true); 217 SetPaintToLayer(ui::LAYER_TEXTURED);
217 layer()->SetFillsBoundsOpaquely(false); 218 layer()->SetFillsBoundsOpaquely(false);
218 layer()->SetMasksToBounds(true); 219 layer()->SetMasksToBounds(true);
219 layer()->SetOpacity(0.0); 220 layer()->SetOpacity(0.0);
220 { 221 {
221 ui::ScopedLayerAnimationSettings animate_fade(layer()->GetAnimator()); 222 ui::ScopedLayerAnimationSettings animate_fade(layer()->GetAnimator());
222 animate_fade.SetTransitionDuration( 223 animate_fade.SetTransitionDuration(
223 base::TimeDelta::FromMilliseconds(100)); 224 base::TimeDelta::FromMilliseconds(100));
224 layer()->SetOpacity(1.0); 225 layer()->SetOpacity(1.0);
225 } 226 }
226 227
227 const int kInsideBorderPaddingDip = 64; 228 const int kInsideBorderPaddingDip = 64;
228 const int kBetweenChildPaddingDip = 10; 229 const int kBetweenChildPaddingDip = 10;
229 views::BoxLayout* layout = new views::BoxLayout( 230 views::BoxLayout* layout = new views::BoxLayout(
230 views::BoxLayout::kHorizontal, kInsideBorderPaddingDip, 231 views::BoxLayout::kHorizontal, kInsideBorderPaddingDip,
231 kInsideBorderPaddingDip, kBetweenChildPaddingDip); 232 kInsideBorderPaddingDip, kBetweenChildPaddingDip);
232 layout->set_cross_axis_alignment( 233 layout->set_cross_axis_alignment(
233 views::BoxLayout::CROSS_AXIS_ALIGNMENT_START); 234 views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
234 mirror_container_->SetLayoutManager(layout); 235 mirror_container_->SetLayoutManager(layout);
235 mirror_container_->SetPaintToLayer(true); 236 mirror_container_->SetPaintToLayer(ui::LAYER_TEXTURED);
236 mirror_container_->layer()->SetFillsBoundsOpaquely(false); 237 mirror_container_->layer()->SetFillsBoundsOpaquely(false);
237 238
238 for (WmWindow* window : windows) { 239 for (WmWindow* window : windows) {
239 // |mirror_container_| owns |view|. 240 // |mirror_container_| owns |view|.
240 views::View* view = new WindowPreviewView(window); 241 views::View* view = new WindowPreviewView(window);
241 window_view_map_[window] = view; 242 window_view_map_[window] = view;
242 mirror_container_->AddChildView(view); 243 mirror_container_->AddChildView(view);
243 } 244 }
244 245
245 // The background needs to be painted to fill the layer, not the View, 246 // The background needs to be painted to fill the layer, not the View,
246 // because the layer animates bounds changes but the View's bounds change 247 // because the layer animates bounds changes but the View's bounds change
247 // immediately. 248 // immediately.
248 highlight_view_->set_background(new LayerFillBackgroundPainter( 249 highlight_view_->set_background(new LayerFillBackgroundPainter(
249 views::Painter::CreateRoundRectWith1PxBorderPainter( 250 views::Painter::CreateRoundRectWith1PxBorderPainter(
250 SkColorSetA(SK_ColorWHITE, 0x4D), SkColorSetA(SK_ColorWHITE, 0x33), 251 SkColorSetA(SK_ColorWHITE, 0x4D), SkColorSetA(SK_ColorWHITE, 0x33),
251 kBackgroundCornerRadius))); 252 kBackgroundCornerRadius)));
252 highlight_view_->SetPaintToLayer(true); 253 highlight_view_->SetPaintToLayer(ui::LAYER_TEXTURED);
254
253 highlight_view_->layer()->SetFillsBoundsOpaquely(false); 255 highlight_view_->layer()->SetFillsBoundsOpaquely(false);
254 256
255 AddChildView(highlight_view_); 257 AddChildView(highlight_view_);
256 AddChildView(mirror_container_); 258 AddChildView(mirror_container_);
257 } 259 }
258 260
259 ~WindowCycleView() override {} 261 ~WindowCycleView() override {}
260 262
261 void SetTargetWindow(WmWindow* target) { 263 void SetTargetWindow(WmWindow* target) {
262 target_window_ = target; 264 target_window_ = target;
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 widget->Init(params); 553 widget->Init(params);
552 554
553 screen_observer_.Add(display::Screen::GetScreen()); 555 screen_observer_.Add(display::Screen::GetScreen());
554 widget->Show(); 556 widget->Show();
555 widget->SetCapture(cycle_view_); 557 widget->SetCapture(cycle_view_);
556 widget->set_auto_release_capture(false); 558 widget->set_auto_release_capture(false);
557 cycle_ui_widget_ = widget; 559 cycle_ui_widget_ = widget;
558 } 560 }
559 561
560 } // namespace ash 562 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698