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

Unified Diff: ui/app_list/views/app_list_view.cc

Issue 429823002: Animate the App List overlay when dialogs are opened (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed changes to the animation observer, and other minor fixes Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_view.cc
diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
index 55a3b6529bb42fa62834501cd8d73f266101a5a2..801e00108da979b907a61367ed9879144e82dc53 100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -118,7 +118,7 @@ class HideViewAnimationObserver : public ui::ImplicitAnimationObserver {
}
void SetTarget(views::View* target) {
- if (!target_)
+ if (target_)
StopObservingImplicitAnimations();
target_ = target;
}
@@ -133,7 +133,8 @@ class HideViewAnimationObserver : public ui::ImplicitAnimationObserver {
target_ = NULL;
// Should update the background by invoking SchedulePaint().
- frame_->SchedulePaint();
+ if (frame_)
+ frame_->SchedulePaint();
}
}
@@ -221,7 +222,28 @@ void AppListView::UpdateBounds() {
void AppListView::SetAppListOverlayVisible(bool visible) {
DCHECK(overlay_view_);
- overlay_view_->SetVisible(visible);
+
+ // Display the overlay immediately so we can begin the animation.
+ overlay_view_->SetVisible(true);
+
+ ui::ScopedLayerAnimationSettings settings(
+ overlay_view_->layer()->GetAnimator());
+ settings.SetTweenType(gfx::Tween::LINEAR);
+
+ // If we're dismissing the overlay, hide the view at the end of the animation.
+ if (!visible) {
+ // Since only one animation is visible at a time, it's safe to re-use
+ // animation_observer_ here.
calamity 2014/08/04 06:50:17 Call animation_observer_->set_frame_view(NULL) her
sashab 2014/08/05 01:17:55 It's not necessary (NULL is the default), but I se
+ animation_observer_->SetTarget(overlay_view_);
+ settings.AddObserver(animation_observer_.get());
+ }
+
+ const float kOverlayFadeInMilliseconds = 125;
+ settings.SetTransitionDuration(
+ base::TimeDelta::FromMilliseconds(kOverlayFadeInMilliseconds));
+
+ const float kOverlayOpacity = 0.75f;
+ overlay_view_->layer()->SetOpacity(visible ? kOverlayOpacity : 0.0f);
}
bool AppListView::ShouldCenterWindow() const {
@@ -366,12 +388,11 @@ void AppListView::InitAsBubbleInternal(gfx::NativeView parent,
// To make the overlay view, construct a view with a white background, rather
// than a white rectangle in it. This is because we need overlay_view_ to be
// drawn to its own layer (so it appears correctly in the foreground).
- const float kOverlayOpacity = 0.75f;
overlay_view_ = new views::View();
overlay_view_->SetPaintToLayer(true);
- overlay_view_->layer()->SetOpacity(kOverlayOpacity);
overlay_view_->SetBoundsRect(GetContentsBounds());
overlay_view_->SetVisible(false);
+ overlay_view_->layer()->SetOpacity(0.0f);
// On platforms that don't support a shadow, the rounded border of the app
// list is constructed _inside_ the view, so a rectangular background goes
// over the border in the rounded corners. To fix this, give the background a
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698