Chromium Code Reviews| Index: ash/wm/overview/window_selector_item.cc |
| diff --git a/ash/wm/overview/window_selector_item.cc b/ash/wm/overview/window_selector_item.cc |
| index e6ce66e0d35aa55995fc9916e213e3c463920a92..41d5470060a20f8f2f6bcf79d7b4aeb6b2330b23 100644 |
| --- a/ash/wm/overview/window_selector_item.cc |
| +++ b/ash/wm/overview/window_selector_item.cc |
| @@ -75,8 +75,43 @@ static const int kShadowBlur = 10; |
| const int WindowSelectorItem::kFadeInMilliseconds = 80; |
| +// Opacity for dimmed items. |
| +static const float kDimmedItemOpacity = 0.5; |
| + |
| +views::Widget* CreateWindowLabel(aura::Window* root_window, |
| + const base::string16 title) { |
| + views::Widget* widget = new views::Widget; |
| + views::Widget::InitParams params; |
| + params.type = views::Widget::InitParams::TYPE_POPUP; |
| + params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
| + params.parent = |
| + Shell::GetContainer(root_window, ash::kShellWindowId_OverlayContainer); |
| + params.accept_events = false; |
| + params.visible_on_all_workspaces = true; |
| + widget->set_focus_on_creation(false); |
| + widget->Init(params); |
| + views::Label* label = new views::Label; |
| + label->SetEnabledColor(kLabelColor); |
| + label->SetBackgroundColor(kLabelBackground); |
| + label->set_shadows(gfx::ShadowValues(1, gfx::ShadowValue( |
| + gfx::Point(0, kVerticalShadowOffset), kShadowBlur, kLabelShadow))); |
| + ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); |
| + label->SetFontList(bundle.GetFontList(ui::ResourceBundle::BoldFont)); |
| + label->SetText(title); |
| + views::BoxLayout* layout = new views::BoxLayout(views::BoxLayout::kVertical, |
| + 0, |
| + kVerticalLabelPadding, |
| + 0); |
| + label->SetLayoutManager(layout); |
| + widget->SetContentsView(label); |
| + widget->Show(); |
| + return widget; |
| +} |
| + |
| WindowSelectorItem::WindowSelectorItem() |
| - : root_window_(NULL), |
| + : dimmed_(false), |
| + root_window_(NULL), |
| in_bounds_update_(false), |
| window_label_view_(NULL) { |
| } |
| @@ -134,12 +169,19 @@ void WindowSelectorItem::SendFocusAlert() const { |
| activate_window_button_->SendFocusAlert(); |
| } |
| +void WindowSelectorItem::SetDimmed(bool dimmed) { |
| + dimmed_ = dimmed; |
| + SetOpacity(dimmed ? kDimmedItemOpacity : 1); |
|
flackr
2014/06/27 20:00:07
nit: Use 1.0f as this is used as a float.
Nina
2014/06/27 22:42:02
Done.
|
| +} |
| + |
| void WindowSelectorItem::ButtonPressed(views::Button* sender, |
| const ui::Event& event) { |
| views::Widget::GetWidgetForNativeView(SelectionWindow())->Close(); |
| } |
| void WindowSelectorItem::OnWindowTitleChanged(aura::Window* window) { |
| + // TODO(flackr): Maybe update dimmed / undimmed status when the label is |
| + // updated? |
| if (window == SelectionWindow()) |
| window_label_view_->SetText(window->title()); |
| } |
| @@ -207,6 +249,11 @@ void WindowSelectorItem::UpdateCloseButtonBounds(aura::Window* root_window, |
| } |
| } |
| +void WindowSelectorItem::SetOpacity(float opacity) { |
| + window_label_->GetNativeWindow()->layer()->SetOpacity(opacity); |
| + close_button_->GetNativeWindow()->layer()->SetOpacity(opacity); |
| +} |
| + |
| void WindowSelectorItem::UpdateWindowLabels(const gfx::Rect& window_bounds, |
| aura::Window* root_window, |
| bool animate) { |