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

Unified Diff: ash/wm/overview/window_selector_window.cc

Issue 256413004: Relayout windows in overview when display size changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge and remove extra newline. Created 6 years, 8 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 | « ash/wm/overview/window_selector_window.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/window_selector_window.cc
diff --git a/ash/wm/overview/window_selector_window.cc b/ash/wm/overview/window_selector_window.cc
index 59d247431b1fcf6a48699affbbe30fbd4bd86417..548026d55ad47b8d8ca19c15c55baf6a5c70f6b6 100644
--- a/ash/wm/overview/window_selector_window.cc
+++ b/ash/wm/overview/window_selector_window.cc
@@ -107,7 +107,7 @@ void WindowSelectorWindow::SetItemBounds(aura::Window* root_window,
// TODO move close button management to WindowSelectorItem, so that we can
// also handle panels.
// See http://crbug.com/352143
- UpdateCloseButtonBounds(root_window);
+ UpdateCloseButtonBounds(root_window, animate);
}
void WindowSelectorWindow::ButtonPressed(views::Button* sender,
@@ -116,7 +116,8 @@ void WindowSelectorWindow::ButtonPressed(views::Button* sender,
transform_window_.window())->Close();
}
-void WindowSelectorWindow::UpdateCloseButtonBounds(aura::Window* root_window) {
+void WindowSelectorWindow::UpdateCloseButtonBounds(aura::Window* root_window,
+ bool animate) {
gfx::Rect align_bounds(
ScreenUtil::ConvertRectFromScreen(root_window, bounds()));
gfx::Transform close_button_transform;
@@ -157,13 +158,17 @@ void WindowSelectorWindow::UpdateCloseButtonBounds(aura::Window* root_window) {
layer->SetOpacity(1);
}
} else {
- ui::ScopedLayerAnimationSettings settings(
- close_button_->GetNativeWindow()->layer()->GetAnimator());
- settings.SetPreemptionStrategy(
- ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
- settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
- ScopedTransformOverviewWindow::kTransitionMilliseconds));
- close_button_->GetNativeWindow()->SetTransform(close_button_transform);
+ if (animate) {
+ ui::ScopedLayerAnimationSettings settings(
+ close_button_->GetNativeWindow()->layer()->GetAnimator());
+ settings.SetPreemptionStrategy(
+ ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+ settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
+ ScopedTransformOverviewWindow::kTransitionMilliseconds));
+ close_button_->GetNativeWindow()->SetTransform(close_button_transform);
+ } else {
+ close_button_->GetNativeWindow()->SetTransform(close_button_transform);
+ }
}
}
« no previous file with comments | « ash/wm/overview/window_selector_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698