Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/system/tray/tray_background_view.h" | 5 #include "ash/system/tray/tray_background_view.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/screen_util.h" | 9 #include "ash/screen_util.h" |
| 10 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" |
| 11 #include "ash/shelf/shelf_widget.h" | 11 #include "ash/shelf/shelf_widget.h" |
| 12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 13 #include "ash/shell_window_ids.h" | 13 #include "ash/shell_window_ids.h" |
| 14 #include "ash/system/status_area_widget.h" | 14 #include "ash/system/status_area_widget.h" |
| 15 #include "ash/system/status_area_widget_delegate.h" | 15 #include "ash/system/status_area_widget_delegate.h" |
| 16 #include "ash/system/tray/system_tray.h" | 16 #include "ash/system/tray/system_tray.h" |
| 17 #include "ash/system/tray/tray_constants.h" | 17 #include "ash/system/tray/tray_constants.h" |
| 18 #include "ash/system/tray/tray_event_filter.h" | 18 #include "ash/system/tray/tray_event_filter.h" |
| 19 #include "ash/wm/window_animations.h" | 19 #include "ash/wm/window_animations.h" |
| 20 #include "grit/ash_resources.h" | 20 #include "grit/ash_resources.h" |
| 21 #include "ui/accessibility/ax_view_state.h" | 21 #include "ui/accessibility/ax_view_state.h" |
| 22 #include "ui/aura/window.h" | 22 #include "ui/aura/window.h" |
| 23 #include "ui/aura/window_event_dispatcher.h" | 23 #include "ui/aura/window_event_dispatcher.h" |
| 24 #include "ui/base/resource/resource_bundle.h" | 24 #include "ui/base/resource/resource_bundle.h" |
| 25 #include "ui/compositor/layer.h" | |
| 26 #include "ui/compositor/layer_animation_element.h" | |
| 27 #include "ui/compositor/scoped_layer_animation_settings.h" | |
| 28 #include "ui/gfx/animation/tween.h" | |
| 25 #include "ui/gfx/canvas.h" | 29 #include "ui/gfx/canvas.h" |
| 26 #include "ui/gfx/image/image_skia.h" | 30 #include "ui/gfx/image/image_skia.h" |
| 27 #include "ui/gfx/image/image_skia_operations.h" | 31 #include "ui/gfx/image/image_skia_operations.h" |
| 28 #include "ui/gfx/rect.h" | 32 #include "ui/gfx/rect.h" |
| 29 #include "ui/gfx/screen.h" | 33 #include "ui/gfx/screen.h" |
| 30 #include "ui/gfx/skia_util.h" | 34 #include "ui/gfx/skia_util.h" |
| 35 #include "ui/gfx/transform.h" | |
| 31 #include "ui/views/background.h" | 36 #include "ui/views/background.h" |
| 32 #include "ui/views/layout/box_layout.h" | 37 #include "ui/views/layout/box_layout.h" |
| 33 | 38 |
| 34 namespace { | 39 namespace { |
| 35 | 40 |
| 36 const int kTrayBackgroundAlpha = 100; | 41 const int kTrayBackgroundAlpha = 100; |
| 37 const int kTrayBackgroundHoverAlpha = 150; | 42 const int kTrayBackgroundHoverAlpha = 150; |
| 38 const SkColor kTrayBackgroundPressedColor = SkColorSetRGB(66, 129, 244); | 43 const SkColor kTrayBackgroundPressedColor = SkColorSetRGB(66, 129, 244); |
| 39 | 44 |
| 40 const int kAnimationDurationForPopupMS = 200; | 45 const int kAnimationDurationForPopupMs = 200; |
| 46 | |
| 47 // Duration of opacity animation for visibility changes. | |
| 48 const int kAnimationDurationForVisibilityMs = 250; | |
| 49 | |
| 50 // When becoming visible delay the animation so that StatusAreaWidgetDelegate | |
| 51 // can animate sibling views out of the position to be occuped by the | |
| 52 // TrayBackgroundView. | |
| 53 const int kShowAnimationDelayMs = 100; | |
| 41 | 54 |
| 42 } // namespace | 55 } // namespace |
| 43 | 56 |
| 44 using views::TrayBubbleView; | 57 using views::TrayBubbleView; |
| 45 | 58 |
| 46 namespace ash { | 59 namespace ash { |
| 47 | 60 |
| 48 // static | 61 // static |
| 49 const char TrayBackgroundView::kViewClassName[] = "tray/TrayBackgroundView"; | 62 const char TrayBackgroundView::kViewClassName[] = "tray/TrayBackgroundView"; |
| 50 | 63 |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 300 | 313 |
| 301 // Initially we want to paint the background, but without the hover effect. | 314 // Initially we want to paint the background, but without the hover effect. |
| 302 hide_background_animator_.SetPaintsBackground( | 315 hide_background_animator_.SetPaintsBackground( |
| 303 true, BACKGROUND_CHANGE_IMMEDIATE); | 316 true, BACKGROUND_CHANGE_IMMEDIATE); |
| 304 hover_background_animator_.SetPaintsBackground( | 317 hover_background_animator_.SetPaintsBackground( |
| 305 false, BACKGROUND_CHANGE_IMMEDIATE); | 318 false, BACKGROUND_CHANGE_IMMEDIATE); |
| 306 | 319 |
| 307 tray_container_ = new TrayContainer(shelf_alignment_); | 320 tray_container_ = new TrayContainer(shelf_alignment_); |
| 308 SetContents(tray_container_); | 321 SetContents(tray_container_); |
| 309 tray_event_filter_.reset(new TrayEventFilter); | 322 tray_event_filter_.reset(new TrayEventFilter); |
| 323 | |
| 324 SetPaintToLayer(true); | |
| 325 SetFillsBoundsOpaquely(false); | |
| 310 } | 326 } |
| 311 | 327 |
| 312 TrayBackgroundView::~TrayBackgroundView() { | 328 TrayBackgroundView::~TrayBackgroundView() { |
| 313 if (GetWidget()) | 329 if (GetWidget()) |
| 314 GetWidget()->RemoveObserver(widget_observer_.get()); | 330 GetWidget()->RemoveObserver(widget_observer_.get()); |
| 315 } | 331 } |
| 316 | 332 |
| 317 void TrayBackgroundView::Initialize() { | 333 void TrayBackgroundView::Initialize() { |
| 318 GetWidget()->AddObserver(widget_observer_.get()); | 334 GetWidget()->AddObserver(widget_observer_.get()); |
| 319 SetTrayBorder(); | 335 SetTrayBorder(); |
| 320 } | 336 } |
| 321 | 337 |
| 338 void TrayBackgroundView::SetVisible(bool visible) { | |
| 339 if (visible == this->visible() && | |
| 340 !(visible && layer()->GetTargetOpacity() == 0.0f)) | |
|
flackr
2014/05/14 17:32:43
This is probably easier to read as:
if (visible ==
jonross
2014/05/14 23:28:47
Done.
| |
| 341 return; | |
| 342 | |
| 343 layer()->GetAnimator()->StopAnimating(); | |
|
flackr
2014/05/14 17:32:43
Is this necessary? If we're mid animation can't we
jonross
2014/05/14 23:28:47
Done.
| |
| 344 if (visible) { | |
| 345 // The alignment of the shelf can change while the TrayBackgroundView is | |
| 346 // hidden. Reset the offscreen transform so that the animation to becoming | |
| 347 // visible reflects the current layout. | |
| 348 HideTransformation(); | |
| 349 // SetVisible(false) is defered until the animation for hiding is done. | |
| 350 // Otherwise the view is immediately hidden and the animation does not | |
| 351 // render. | |
| 352 views::View::SetVisible(visible); | |
| 353 } | |
| 354 | |
| 355 ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator()); | |
| 356 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds( | |
| 357 kAnimationDurationForVisibilityMs)); | |
| 358 animation.SetPreemptionStrategy( | |
| 359 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); | |
| 360 | |
| 361 if (visible) { | |
| 362 animation.SetTweenType(gfx::Tween::EASE_OUT); | |
| 363 // Show is delayed so as to allow time for other children of | |
| 364 // StatusAreaWidget to begin animating to their new positions. | |
| 365 layer()->GetAnimator()->SchedulePauseForProperties( | |
| 366 base::TimeDelta::FromMilliseconds(kShowAnimationDelayMs), | |
| 367 ui::LayerAnimationElement::OPACITY | | |
| 368 ui::LayerAnimationElement::TRANSFORM); | |
| 369 // layer()->SetVisible(true) is handled by views::View::SetVisible(true) so | |
| 370 // we do not need to apply that change while becoming visible. | |
| 371 layer()->SetOpacity(1.0f); | |
| 372 gfx::Transform transform; | |
| 373 transform.Translate(0.0f, 0.0f); | |
| 374 layer()->SetTransform(transform); | |
| 375 } else { | |
| 376 // Listen only to the hide animation. As we cannot turn off visibility | |
| 377 // until the animation is over. | |
| 378 animation.AddObserver(this); | |
| 379 animation.SetTweenType(gfx::Tween::EASE_IN); | |
| 380 layer()->SetOpacity(0.0f); | |
| 381 layer()->SetVisible(false); | |
| 382 HideTransformation(); | |
| 383 } | |
| 384 } | |
| 385 | |
| 322 const char* TrayBackgroundView::GetClassName() const { | 386 const char* TrayBackgroundView::GetClassName() const { |
| 323 return kViewClassName; | 387 return kViewClassName; |
| 324 } | 388 } |
| 325 | 389 |
| 326 void TrayBackgroundView::OnMouseEntered(const ui::MouseEvent& event) { | 390 void TrayBackgroundView::OnMouseEntered(const ui::MouseEvent& event) { |
| 327 hovered_ = true; | 391 hovered_ = true; |
| 328 } | 392 } |
| 329 | 393 |
| 330 void TrayBackgroundView::OnMouseExited(const ui::MouseEvent& event) { | 394 void TrayBackgroundView::OnMouseExited(const ui::MouseEvent& event) { |
| 331 hovered_ = false; | 395 hovered_ = false; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 413 top_edge = 0; | 477 top_edge = 0; |
| 414 left_edge = ShelfLayoutManager::kShelfItemInset; | 478 left_edge = ShelfLayoutManager::kShelfItemInset; |
| 415 bottom_edge = on_edge ? kPaddingFromEdgeOfShelf : 0; | 479 bottom_edge = on_edge ? kPaddingFromEdgeOfShelf : 0; |
| 416 right_edge = kShelfSize - | 480 right_edge = kShelfSize - |
| 417 ShelfLayoutManager::kShelfItemInset - kShelfItemHeight; | 481 ShelfLayoutManager::kShelfItemInset - kShelfItemHeight; |
| 418 } | 482 } |
| 419 SetBorder(views::Border::CreateEmptyBorder( | 483 SetBorder(views::Border::CreateEmptyBorder( |
| 420 top_edge, left_edge, bottom_edge, right_edge)); | 484 top_edge, left_edge, bottom_edge, right_edge)); |
| 421 } | 485 } |
| 422 | 486 |
| 487 void TrayBackgroundView::OnImplicitAnimationsCompleted() { | |
| 488 views::View::SetVisible(false); | |
| 489 } | |
| 490 | |
| 491 void TrayBackgroundView::HideTransformation() { | |
| 492 gfx::Transform transform; | |
| 493 if (shelf_alignment_ == SHELF_ALIGNMENT_BOTTOM || | |
| 494 shelf_alignment_ == SHELF_ALIGNMENT_TOP) | |
| 495 transform.Translate(width(), 0.0f); | |
| 496 else | |
| 497 transform.Translate(0.0f, height()); | |
| 498 layer()->SetTransform(transform); | |
| 499 } | |
| 500 | |
| 423 void TrayBackgroundView::InitializeBubbleAnimations( | 501 void TrayBackgroundView::InitializeBubbleAnimations( |
| 424 views::Widget* bubble_widget) { | 502 views::Widget* bubble_widget) { |
| 425 wm::SetWindowVisibilityAnimationType( | 503 wm::SetWindowVisibilityAnimationType( |
| 426 bubble_widget->GetNativeWindow(), | 504 bubble_widget->GetNativeWindow(), |
| 427 wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); | 505 wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); |
| 428 wm::SetWindowVisibilityAnimationTransition( | 506 wm::SetWindowVisibilityAnimationTransition( |
| 429 bubble_widget->GetNativeWindow(), | 507 bubble_widget->GetNativeWindow(), |
| 430 wm::ANIMATE_HIDE); | 508 wm::ANIMATE_HIDE); |
| 431 wm::SetWindowVisibilityAnimationDuration( | 509 wm::SetWindowVisibilityAnimationDuration( |
| 432 bubble_widget->GetNativeWindow(), | 510 bubble_widget->GetNativeWindow(), |
| 433 base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMS)); | 511 base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMs)); |
| 434 } | 512 } |
| 435 | 513 |
| 436 aura::Window* TrayBackgroundView::GetBubbleWindowContainer() const { | 514 aura::Window* TrayBackgroundView::GetBubbleWindowContainer() const { |
| 437 return ash::Shell::GetContainer( | 515 return ash::Shell::GetContainer( |
| 438 tray_container()->GetWidget()->GetNativeWindow()->GetRootWindow(), | 516 tray_container()->GetWidget()->GetNativeWindow()->GetRootWindow(), |
| 439 ash::kShellWindowId_SettingBubbleContainer); | 517 ash::kShellWindowId_SettingBubbleContainer); |
| 440 } | 518 } |
| 441 | 519 |
| 442 gfx::Rect TrayBackgroundView::GetBubbleAnchorRect( | 520 gfx::Rect TrayBackgroundView::GetBubbleAnchorRect( |
| 443 views::Widget* anchor_widget, | 521 views::Widget* anchor_widget, |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 519 background_->set_alpha(kTrayBackgroundAlpha); | 597 background_->set_alpha(kTrayBackgroundAlpha); |
| 520 SchedulePaint(); | 598 SchedulePaint(); |
| 521 } | 599 } |
| 522 | 600 |
| 523 void TrayBackgroundView::UpdateBubbleViewArrow( | 601 void TrayBackgroundView::UpdateBubbleViewArrow( |
| 524 views::TrayBubbleView* bubble_view) { | 602 views::TrayBubbleView* bubble_view) { |
| 525 // Nothing to do here. | 603 // Nothing to do here. |
| 526 } | 604 } |
| 527 | 605 |
| 528 } // namespace ash | 606 } // namespace ash |
| OLD | NEW |