Does not override default animation when closing a docked window
BUG=317204 Review URL: https://codereview.chromium.org/68513003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234697 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
@@ -591,11 +591,13 @@ void DockedWindowLayoutManager::OnWindowVisibilityChanging(
|
|||||||
aura::Window* window, bool visible) {
|
aura::Window* window, bool visible) {
|
||||||
if (IsPopupOrTransient(window))
|
if (IsPopupOrTransient(window))
|
||||||
return;
|
return;
|
||||||
int animation_type = WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE;
|
int animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT;
|
||||||
if (visible) {
|
if (visible) {
|
||||||
animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT;
|
animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DROP;
|
||||||
views::corewm::SetWindowVisibilityAnimationDuration(
|
views::corewm::SetWindowVisibilityAnimationDuration(
|
||||||
window, base::TimeDelta::FromMilliseconds(kFadeDurationMs));
|
window, base::TimeDelta::FromMilliseconds(kFadeDurationMs));
|
||||||
|
} else if (wm::GetWindowState(window)->IsMinimized()) {
|
||||||
|
animation_type = WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE;
|
||||||
}
|
}
|
||||||
views::corewm::SetWindowVisibilityAnimationType(window, animation_type);
|
views::corewm::SetWindowVisibilityAnimationType(window, animation_type);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user