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

Side by Side Diff: ash/common/wm/overview/window_selector_item.cc

Issue 2154323002: [ash-md] Fixes z-order to get context menus above overview items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « ash/common/wm/overview/window_selector.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/wm/overview/window_selector_item.h" 5 #include "ash/common/wm/overview/window_selector_item.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/material_design/material_design_controller.h" 10 #include "ash/common/material_design/material_design_controller.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 window_selector_(window_selector) { 287 window_selector_(window_selector) {
288 CreateWindowLabel(window->GetTitle()); 288 CreateWindowLabel(window->GetTitle());
289 if (!ash::MaterialDesignController::IsOverviewMaterial()) { 289 if (!ash::MaterialDesignController::IsOverviewMaterial()) {
290 views::Widget::InitParams params; 290 views::Widget::InitParams params;
291 params.type = views::Widget::InitParams::TYPE_POPUP; 291 params.type = views::Widget::InitParams::TYPE_POPUP;
292 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 292 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
293 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 293 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
294 close_button_widget_.reset(new views::Widget); 294 close_button_widget_.reset(new views::Widget);
295 close_button_widget_->set_focus_on_creation(false); 295 close_button_widget_->set_focus_on_creation(false);
296 window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer( 296 window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
297 close_button_widget_.get(), kShellWindowId_OverlayContainer, &params); 297 close_button_widget_.get(), kShellWindowId_StatusContainer, &params);
298 close_button_widget_->Init(params); 298 close_button_widget_->Init(params);
299 close_button_->SetVisible(false); 299 close_button_->SetVisible(false);
300 close_button_widget_->SetContentsView(close_button_); 300 close_button_widget_->SetContentsView(close_button_);
301 close_button_widget_->SetSize(close_button_->GetPreferredSize()); 301 close_button_widget_->SetSize(close_button_->GetPreferredSize());
302 close_button_widget_->Show(); 302 close_button_widget_->Show();
303 303
304 gfx::Rect close_button_rect(close_button_->GetPreferredSize()); 304 gfx::Rect close_button_rect(close_button_->GetPreferredSize());
305 // Align the center of the button with position (0, 0) so that the 305 // Align the center of the button with position (0, 0) so that the
306 // translate transform does not need to take the button dimensions into 306 // translate transform does not need to take the button dimensions into
307 // account. 307 // account.
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 const bool material = ash::MaterialDesignController::IsOverviewMaterial(); 527 const bool material = ash::MaterialDesignController::IsOverviewMaterial();
528 window_label_.reset(new views::Widget); 528 window_label_.reset(new views::Widget);
529 views::Widget::InitParams params; 529 views::Widget::InitParams params;
530 params.type = views::Widget::InitParams::TYPE_POPUP; 530 params.type = views::Widget::InitParams::TYPE_POPUP;
531 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 531 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
532 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 532 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
533 params.visible_on_all_workspaces = true; 533 params.visible_on_all_workspaces = true;
534 window_label_->set_focus_on_creation(false); 534 window_label_->set_focus_on_creation(false);
535 root_window_->GetRootWindowController() 535 root_window_->GetRootWindowController()
536 ->ConfigureWidgetInitParamsForContainer( 536 ->ConfigureWidgetInitParamsForContainer(
537 window_label_.get(), kShellWindowId_OverlayContainer, &params); 537 window_label_.get(), kShellWindowId_StatusContainer, &params);
538 window_label_->Init(params); 538 window_label_->Init(params);
539 window_label_button_view_ = new OverviewLabelButton(this, title); 539 window_label_button_view_ = new OverviewLabelButton(this, title);
540 window_label_button_view_->SetBorder(views::Border::NullBorder()); 540 window_label_button_view_->SetBorder(views::Border::NullBorder());
541 window_label_button_view_->SetEnabledTextColors(kLabelColor); 541 window_label_button_view_->SetEnabledTextColors(kLabelColor);
542 window_label_button_view_->set_animate_on_state_change(false); 542 window_label_button_view_->set_animate_on_state_change(false);
543 if (material) { 543 if (material) {
544 window_label_button_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT); 544 window_label_button_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
545 } else { 545 } else {
546 window_label_button_view_->SetHorizontalAlignment(gfx::ALIGN_CENTER); 546 window_label_button_view_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
547 window_label_button_view_->SetTextShadows(gfx::ShadowValues( 547 window_label_button_view_->SetTextShadows(gfx::ShadowValues(
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 window_label_selector_window->SetOpacity(opacity); 667 window_label_selector_window->SetOpacity(opacity);
668 } 668 }
669 669
670 void WindowSelectorItem::UpdateCloseButtonAccessibilityName() { 670 void WindowSelectorItem::UpdateCloseButtonAccessibilityName() {
671 close_button_->SetAccessibleName(l10n_util::GetStringFUTF16( 671 close_button_->SetAccessibleName(l10n_util::GetStringFUTF16(
672 IDS_ASH_OVERVIEW_CLOSE_ITEM_BUTTON_ACCESSIBLE_NAME, 672 IDS_ASH_OVERVIEW_CLOSE_ITEM_BUTTON_ACCESSIBLE_NAME,
673 GetWindow()->GetTitle())); 673 GetWindow()->GetTitle()));
674 } 674 }
675 675
676 } // namespace ash 676 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm/overview/window_selector.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698