diff options
| author | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 08:46:55 +0000 |
|---|---|---|
| committer | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 08:46:55 +0000 |
| commit | 3054d6ba28d587eadee7ddfce54261bab755f8a4 (patch) | |
| tree | e8c07aa9bf41b9efc345da2cf87efdc97c91abfc /ash | |
| parent | 0c11d24154bf944c1a97635c3276089f3fcb52c7 (diff) | |
| download | chromium_src-3054d6ba28d587eadee7ddfce54261bab755f8a4.zip chromium_src-3054d6ba28d587eadee7ddfce54261bab755f8a4.tar.gz chromium_src-3054d6ba28d587eadee7ddfce54261bab755f8a4.tar.bz2 | |
Avoid hiding a docked window when it is going to get fullscreened
BUG=309955
Review URL: https://codereview.chromium.org/38603002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/dock/docked_window_layout_manager.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc index f5f5028..e8f24f7 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/dock/docked_window_layout_manager.cc @@ -108,7 +108,11 @@ void UndockWindow(aura::Window* window) { aura::Window* focused = aura::client::GetFocusClient(window)->GetFocusedWindow(); bool had_focus = window == focused || window->Contains(focused); - window->Hide(); + // Hide a window to prevent it from being animated during reparenting. + // This is useful when minimizing or maximizing a window out of dock but not + // when transitioning to fullscreen. + if (!wm::GetWindowState(window)->IsFullscreen()) + window->Hide(); window->layer()->GetAnimator()->StopAnimating(); gfx::Rect previous_bounds = window->bounds(); aura::Window* previous_parent = window->parent(); |