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

Side by Side Diff: ash/frame/caption_buttons/frame_caption_button_container_view.cc

Issue 271913002: Animate window control changes in TouchView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/frame/caption_buttons/frame_caption_button_container_view.h" 5 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <map>
8 9
9 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
10 #include "ash/frame/caption_buttons/frame_caption_button.h" 11 #include "ash/frame/caption_buttons/frame_caption_button.h"
11 #include "ash/frame/caption_buttons/frame_size_button.h" 12 #include "ash/frame/caption_buttons/frame_size_button.h"
12 #include "ash/metrics/user_metrics_recorder.h" 13 #include "ash/metrics/user_metrics_recorder.h"
13 #include "ash/shell.h" 14 #include "ash/shell.h"
14 #include "grit/ui_strings.h" // Accessibility names 15 #include "grit/ui_strings.h" // Accessibility names
15 #include "ui/base/hit_test.h" 16 #include "ui/base/hit_test.h"
16 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/compositor/layer.h"
17 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 19 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
20 #include "ui/compositor/scoped_layer_animation_settings.h"
21 #include "ui/gfx/animation/tween.h"
18 #include "ui/gfx/canvas.h" 22 #include "ui/gfx/canvas.h"
19 #include "ui/gfx/insets.h" 23 #include "ui/gfx/insets.h"
20 #include "ui/gfx/point.h" 24 #include "ui/gfx/point.h"
21 #include "ui/views/widget/widget.h" 25 #include "ui/views/widget/widget.h"
22 #include "ui/views/widget/widget_delegate.h" 26 #include "ui/views/widget/widget_delegate.h"
23 27
24 namespace ash { 28 namespace ash {
25 29
26 namespace { 30 namespace {
27 31
32 // Visual design parameters for animating the transition to maximize mode.
33 // When the size button hides we delay sliding the minimize button into its
34 // location. Also used to delay showing the size button so that the minimize
35 // button slides out of that position.
36 const int kAnimationDelayMs = 100;
37 const int kMinimizeSlideDurationMs = 500;
38 const int kSizeFadeDurationMs = 250;
39
28 // Converts |point| from |src| to |dst| and hittests against |dst|. 40 // Converts |point| from |src| to |dst| and hittests against |dst|.
29 bool ConvertPointToViewAndHitTest(const views::View* src, 41 bool ConvertPointToViewAndHitTest(const views::View* src,
30 const views::View* dst, 42 const views::View* dst,
31 const gfx::Point& point) { 43 const gfx::Point& point) {
32 gfx::Point converted(point); 44 gfx::Point converted(point);
33 views::View::ConvertPointToTarget(src, dst, &converted); 45 views::View::ConvertPointToTarget(src, dst, &converted);
34 return dst->HitTestPoint(converted); 46 return dst->HitTestPoint(converted);
35 } 47 }
36 48
37 } // namespace 49 } // namespace
38 50
39 // static 51 // static
40 const char FrameCaptionButtonContainerView::kViewClassName[] = 52 const char FrameCaptionButtonContainerView::kViewClassName[] =
41 "FrameCaptionButtonContainerView"; 53 "FrameCaptionButtonContainerView";
42 54
43 FrameCaptionButtonContainerView::FrameCaptionButtonContainerView( 55 FrameCaptionButtonContainerView::FrameCaptionButtonContainerView(
44 views::Widget* frame, 56 views::Widget* frame,
45 MinimizeAllowed minimize_allowed) 57 MinimizeAllowed minimize_allowed)
46 : frame_(frame), 58 : frame_(frame),
47 minimize_button_(NULL), 59 minimize_button_(NULL),
48 size_button_(NULL), 60 size_button_(NULL),
49 close_button_(NULL) { 61 close_button_(NULL) {
62 SetPaintToLayer(true);
63 SetFillsBoundsOpaquely(false);
64
50 // Insert the buttons left to right. 65 // Insert the buttons left to right.
51 minimize_button_ = new FrameCaptionButton(this, CAPTION_BUTTON_ICON_MINIMIZE); 66 minimize_button_ = new FrameCaptionButton(this, CAPTION_BUTTON_ICON_MINIMIZE);
52 minimize_button_->SetAccessibleName( 67 minimize_button_->SetAccessibleName(
53 l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MINIMIZE)); 68 l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MINIMIZE));
54 minimize_button_->SetVisible(minimize_allowed == MINIMIZE_ALLOWED); 69 minimize_button_->SetVisible(minimize_allowed == MINIMIZE_ALLOWED);
70 minimize_button_->SetPaintToLayer(true);
71 minimize_button_->SetFillsBoundsOpaquely(false);
72
55 AddChildView(minimize_button_); 73 AddChildView(minimize_button_);
56 74
57 size_button_ = new FrameSizeButton(this, frame, this); 75 size_button_ = new FrameSizeButton(this, frame, this);
58 size_button_->SetAccessibleName( 76 size_button_->SetAccessibleName(
59 l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MAXIMIZE)); 77 l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MAXIMIZE));
78 size_button_->SetPaintToLayer(true);
79 size_button_->SetFillsBoundsOpaquely(false);
60 UpdateSizeButtonVisibility(false); 80 UpdateSizeButtonVisibility(false);
61 AddChildView(size_button_); 81 AddChildView(size_button_);
62 82
63 close_button_ = new FrameCaptionButton(this, CAPTION_BUTTON_ICON_CLOSE); 83 close_button_ = new FrameCaptionButton(this, CAPTION_BUTTON_ICON_CLOSE);
64 close_button_->SetAccessibleName( 84 close_button_->SetAccessibleName(
65 l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE)); 85 l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE));
86 close_button_->SetPaintToLayer(true);
87 close_button_->SetFillsBoundsOpaquely(false);
66 AddChildView(close_button_); 88 AddChildView(close_button_);
67 } 89 }
68 90
69 FrameCaptionButtonContainerView::~FrameCaptionButtonContainerView() { 91 FrameCaptionButtonContainerView::~FrameCaptionButtonContainerView() {
70 } 92 }
71 93
72 void FrameCaptionButtonContainerView::SetButtonImages( 94 void FrameCaptionButtonContainerView::SetButtonImages(
73 CaptionButtonIcon icon, 95 CaptionButtonIcon icon,
74 int icon_image_id, 96 int icon_image_id,
75 int inactive_icon_image_id, 97 int inactive_icon_image_id,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 } 142 }
121 143
122 void FrameCaptionButtonContainerView::UpdateSizeButtonVisibility( 144 void FrameCaptionButtonContainerView::UpdateSizeButtonVisibility(
123 bool force_hidden) { 145 bool force_hidden) {
124 // TODO(flackr): Refactor the Maximize Mode notifications. Currently 146 // TODO(flackr): Refactor the Maximize Mode notifications. Currently
125 // UpdateSizeButtonVisibilty requires a force_hidden parameter. This is 147 // UpdateSizeButtonVisibilty requires a force_hidden parameter. This is
126 // because Shell::IsMaximizeWindowManagerEnabled is still false at the 148 // because Shell::IsMaximizeWindowManagerEnabled is still false at the
127 // time when ShellObserver::OnMaximizeModeStarted is called. This prevents 149 // time when ShellObserver::OnMaximizeModeStarted is called. This prevents
128 // this method from performing that check, and instead relies on the calling 150 // this method from performing that check, and instead relies on the calling
129 // code to tell it to force being hidden. 151 // code to tell it to force being hidden.
130 size_button_->SetVisible( 152
131 !force_hidden && frame_->widget_delegate()->CanMaximize()); 153 bool visible = !force_hidden && frame_->widget_delegate()->CanMaximize();
154
155 // Turning visibility off prevents animations from rendering. Setting the
156 // size button visibility to false will occur after the animation.
157 if (visible)
158 size_button_->SetVisible(visible);
159
160 ui::ScopedLayerAnimationSettings settings(
161 size_button_->layer()->GetAnimator());
162 settings.SetTransitionDuration(
163 base::TimeDelta::FromMilliseconds(kSizeFadeDurationMs));
164 settings.SetPreemptionStrategy(
165 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
166
167 if (visible) {
168 settings.SetTweenType(gfx::Tween::EASE_OUT);
169 // Delay fade in so that the minimize button has begun its sliding
170 // animation.
171 size_button_->layer()->GetAnimator()->SchedulePauseForProperties(
172 base::TimeDelta::FromMilliseconds(kAnimationDelayMs),
173 ui::LayerAnimationElement::OPACITY);
174 size_button_->layer()->SetOpacity(1.0f);
175 size_button_->layer()->SetVisible(true);
176 } else {
177 settings.SetTweenType(gfx::Tween::EASE_IN);
178 // Observer will call size_button_->SetVisible(false) upon completion of
179 // the animation.
180 // TODO(jonross): avoid the delayed SetVisible(false) call by acquring
181 // the size_button's layer before making it invisible. That layer can then
182 // be animated and deleted upon completion of the animation. See
183 // LayerOwner::RecreateLayer
184 settings.AddObserver(this);
185 size_button_->layer()->SetOpacity(0.0f);
186 size_button_->layer()->SetVisible(false);
187 }
132 } 188 }
133 189
134 gfx::Size FrameCaptionButtonContainerView::GetPreferredSize() { 190 gfx::Size FrameCaptionButtonContainerView::GetPreferredSize() {
135 int width = 0; 191 int width = 0;
136 for (int i = 0; i < child_count(); ++i) { 192 for (int i = 0; i < child_count(); ++i) {
137 views::View* child = child_at(i); 193 views::View* child = child_at(i);
138 if (child->visible()) 194 if (child->visible())
139 width += child_at(i)->GetPreferredSize().width(); 195 width += child_at(i)->GetPreferredSize().width();
140 } 196 }
141 return gfx::Size(width, close_button_->GetPreferredSize().height()); 197 return gfx::Size(width, close_button_->GetPreferredSize().height());
142 } 198 }
143 199
144 void FrameCaptionButtonContainerView::Layout() { 200 void FrameCaptionButtonContainerView::Layout() {
145 int x = 0; 201 int x = width();
146 for (int i = 0; i < child_count(); ++i) { 202 int offset_x = 0;
203 for (int i = child_count() - 1; i >= 0; --i) {
147 views::View* child = child_at(i); 204 views::View* child = child_at(i);
148 if (!child->visible()) 205 ui::LayerAnimator* child_animator = child->layer()->GetAnimator();
206 bool child_animating = child_animator->is_animating();
207 // The actual property visibility is not being animated, otherwise the
208 // view does not render.
209 bool child_animating_visibility = child_animator->
jonross 2014/05/15 20:24:13 Not removed yet, as layout can be called multiple
210 IsAnimatingProperty(ui::LayerAnimationElement::OPACITY);
211 bool child_target_visibility = child->layer()->GetTargetVisibility();
212
213 if (child_animating_visibility) {
214 if (child_target_visibility)
215 offset_x += child->width();
flackr 2014/05/16 18:40:12 Isn't the child's size accounted for by not breaki
jonross 2014/05/16 19:50:01 The child's size is accounted for when becoming vi
216 else
217 offset_x -= child->width();
218 }
219
220 if (!child->visible() || !child->layer()->GetTargetVisibility())
flackr 2014/05/16 18:40:12 !child_target_visibility?
jonross 2014/05/16 19:50:01 Done.
149 continue; 221 continue;
150 222
223 scoped_ptr<ui::ScopedLayerAnimationSettings> animation;
151 gfx::Size size = child->GetPreferredSize(); 224 gfx::Size size = child->GetPreferredSize();
225 x -= size.width();
226
227 // Animate the button if the previous button is currently animating
flackr 2014/05/16 18:40:12 s/if the/if a
jonross 2014/05/16 19:50:01 Done.
228 // its visibility.
229 if (offset_x != 0) {
230 if (!child_animating)
231 child->SetBounds(x+offset_x, 0, size.width(), size.height() );
flackr 2014/05/16 18:40:12 s/x+offset_x/x + offset_x s/ );/);
jonross 2014/05/16 19:50:01 Done.
232 if (offset_x < 0) {
233 // Delay sliding to where the previous button was located.
234 child_animator->SchedulePauseForProperties(
235 base::TimeDelta::FromMilliseconds(kAnimationDelayMs),
236 ui::LayerAnimationElement::BOUNDS);
237 }
238
239 ui::ScopedLayerAnimationSettings* settings =
240 new ui::ScopedLayerAnimationSettings(child_animator);
241 settings->SetTransitionDuration(
242 base::TimeDelta::FromMilliseconds(kMinimizeSlideDurationMs));
243 settings->SetPreemptionStrategy(
244 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
245 settings->SetTweenType(gfx::Tween::EASE_OUT);
246 animation.reset(settings);
247 }
152 child->SetBounds(x, 0, size.width(), size.height()); 248 child->SetBounds(x, 0, size.width(), size.height());
153 x += size.width();
154 } 249 }
155 } 250 }
156 251
157 const char* FrameCaptionButtonContainerView::GetClassName() const { 252 const char* FrameCaptionButtonContainerView::GetClassName() const {
158 return kViewClassName; 253 return kViewClassName;
159 } 254 }
160 255
161 void FrameCaptionButtonContainerView::SetButtonIcon(FrameCaptionButton* button, 256 void FrameCaptionButtonContainerView::SetButtonIcon(FrameCaptionButton* button,
162 CaptionButtonIcon icon, 257 CaptionButtonIcon icon,
163 Animate animate) { 258 Animate animate) {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 } 290 }
196 291
197 // Abort any animations of the button icons. 292 // Abort any animations of the button icons.
198 SetButtonsToNormal(ANIMATE_NO); 293 SetButtonsToNormal(ANIMATE_NO);
199 294
200 ash::UserMetricsAction action = 295 ash::UserMetricsAction action =
201 ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MINIMIZE; 296 ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MINIMIZE;
202 if (sender == minimize_button_) { 297 if (sender == minimize_button_) {
203 frame_->Minimize(); 298 frame_->Minimize();
204 } else if (sender == size_button_) { 299 } else if (sender == size_button_) {
205 if (frame_->IsFullscreen()) { // Can be clicked in immersive fullscreen. 300 if (frame_->IsFullscreen()) { // Can be clicked in immersive fullscreen.
206 frame_->SetFullscreen(false); 301 frame_->SetFullscreen(false);
207 action = ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_EXIT_FULLSCREEN; 302 action = ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_EXIT_FULLSCREEN;
208 } else if (frame_->IsMaximized()) { 303 } else if (frame_->IsMaximized()) {
209 frame_->Restore(); 304 frame_->Restore();
210 action = ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_RESTORE; 305 action = ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_RESTORE;
211 } else { 306 } else {
212 frame_->Maximize(); 307 frame_->Maximize();
213 action = ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MAXIMIZE; 308 action = ash::UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MAXIMIZE;
214 } 309 }
215 } else if(sender == close_button_) { 310 } else if (sender == close_button_) {
216 frame_->Close(); 311 frame_->Close();
217 action = ash::UMA_WINDOW_CLOSE_BUTTON_CLICK; 312 action = ash::UMA_WINDOW_CLOSE_BUTTON_CLICK;
218 } else { 313 } else {
219 return; 314 return;
220 } 315 }
221 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(action); 316 ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(action);
222 } 317 }
223 318
224 bool FrameCaptionButtonContainerView::IsMinimizeButtonVisible() const { 319 bool FrameCaptionButtonContainerView::IsMinimizeButtonVisible() const {
225 return minimize_button_->visible(); 320 return minimize_button_->visible();
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 FrameCaptionButton* button = buttons[i]; 377 FrameCaptionButton* button = buttons[i];
283 views::Button::ButtonState new_state = views::Button::STATE_NORMAL; 378 views::Button::ButtonState new_state = views::Button::STATE_NORMAL;
284 if (button == to_hover) 379 if (button == to_hover)
285 new_state = views::Button::STATE_HOVERED; 380 new_state = views::Button::STATE_HOVERED;
286 else if (button == to_press) 381 else if (button == to_press)
287 new_state = views::Button::STATE_PRESSED; 382 new_state = views::Button::STATE_PRESSED;
288 button->SetState(new_state); 383 button->SetState(new_state);
289 } 384 }
290 } 385 }
291 386
387 void FrameCaptionButtonContainerView::OnImplicitAnimationsCompleted() {
388 // If there is another animation in the queue, the reverse animation was
389 // triggered before the completion of animating to invisible. Do not turn off
390 // the visibility so that the next animation may render.
391 if (!size_button_->layer()->GetAnimator()->is_animating() &&
392 !size_button_->layer()->GetTargetVisibility())
393 size_button_->SetVisible(false);
394 // TODO(jonross): currently we need to delay telling the parent about the
395 // size change from visibility. When the size changes this forces a relayout
396 // and we want to animate both the bounds of FrameCaptionButtonContainerView
397 // along with that of its children. However when the parent is currently
398 // having its bounds changed this leads to strange animations where this view
399 // renders outside of its parents. Create a more specific animation where
400 // height and y are immediately fixed, and where we only animate width and x.
401 PreferredSizeChanged();
402 }
403
292 FrameCaptionButtonContainerView::ButtonIconIds::ButtonIconIds() 404 FrameCaptionButtonContainerView::ButtonIconIds::ButtonIconIds()
293 : icon_image_id(-1), 405 : icon_image_id(-1),
294 inactive_icon_image_id(-1), 406 inactive_icon_image_id(-1),
295 hovered_background_image_id(-1), 407 hovered_background_image_id(-1),
296 pressed_background_image_id(-1) { 408 pressed_background_image_id(-1) {
297 } 409 }
298 410
299 FrameCaptionButtonContainerView::ButtonIconIds::ButtonIconIds( 411 FrameCaptionButtonContainerView::ButtonIconIds::ButtonIconIds(
300 int icon_id, 412 int icon_id,
301 int inactive_icon_id, 413 int inactive_icon_id,
302 int hovered_background_id, 414 int hovered_background_id,
303 int pressed_background_id) 415 int pressed_background_id)
304 : icon_image_id(icon_id), 416 : icon_image_id(icon_id),
305 inactive_icon_image_id(inactive_icon_id), 417 inactive_icon_image_id(inactive_icon_id),
306 hovered_background_image_id(hovered_background_id), 418 hovered_background_image_id(hovered_background_id),
307 pressed_background_image_id(pressed_background_id) { 419 pressed_background_image_id(pressed_background_id) {
308 } 420 }
309 421
310 FrameCaptionButtonContainerView::ButtonIconIds::~ButtonIconIds() { 422 FrameCaptionButtonContainerView::ButtonIconIds::~ButtonIconIds() {
311 } 423 }
312 424
313 } // namespace ash 425 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698