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

Unified Diff: chrome/browser/ui/views/toolbar/app_menu_animation.cc

Issue 2789203003: [Views] App Menu Animated Icon (Closed)
Patch Set: Added layer Created 3 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
Index: chrome/browser/ui/views/toolbar/app_menu_animation.cc
diff --git a/chrome/browser/ui/views/toolbar/app_menu_animation.cc b/chrome/browser/ui/views/toolbar/app_menu_animation.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a7d46211bec891f193169b96a1ce76610fcb2b2c
--- /dev/null
+++ b/chrome/browser/ui/views/toolbar/app_menu_animation.cc
@@ -0,0 +1,194 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/views/toolbar/app_menu_animation.h"
+
+#include "base/memory/ptr_util.h"
+#include "cc/paint/paint_flags.h"
+#include "chrome/browser/ui/views/toolbar/app_menu_button.h"
+#include "ui/gfx/animation/tween.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/color_palette.h"
+#include "ui/gfx/color_utils.h"
+#include "ui/gfx/skia_util.h"
+
+namespace {
+
+// Duration of the open and close animations in ms.
+constexpr float kOpenDuration = 733.0f;
msw 2017/04/13 17:23:12 nit: be consistent about the 'Ms' post-fix for dur
spqchan 2017/04/13 22:52:42 Done.
+constexpr float kCloseDuration = 283.0f;
+
+// Duration of the color animation in ms.
+constexpr float kColorDurationMs = 100.0f;
+
+// The % the top and bottom dots need to be offset from the middle.
+constexpr float kDotYOffset = 0.32f;
+
+// Value of the stroke when the icon is opened or closed.
+constexpr float kCloseStroke = 0.204f;
+constexpr float kOpenStroke = 0.136f;
+
+// Value of the width when the animation is fully opened.
+constexpr float kOpenWidth = 0.52f;
+
+// The delay of the color and dot animations in ms.
+constexpr float kColorDelayMs = 33.33f;
+constexpr float kDotDelayMs = 66.67f;
+
+// The % of time it takes for each dot to animate to its full width.
+constexpr float kTopWidthOpenInterval = 533.3f / kOpenDuration;
+constexpr float kMiddleWidthOpenInterval = 383.3f / kOpenDuration;
+constexpr float kBottomWidthOpenInterval = 400.0f / kOpenDuration;
+
+// The % of time it takes for each dot to animate to its final stroke.
+constexpr float kTopStrokeOpenInterval = 400.0f / kOpenDuration;
+constexpr float kMiddleStrokeOpenInterval = 283.3f / kOpenDuration;
+constexpr float kBottomStrokeOpenInterval = 266.7f / kOpenDuration;
+
+// The % of time it takes for each dot to animate its width and stroke.
+constexpr float kWidthStrokeCloseInterval = 150.0f / kCloseDuration;
+
+} // namespace
+
+AppMenuAnimation::AppMenuDot::AppMenuDot(base::TimeDelta delay,
+ float width_open_interval,
+ float stroke_open_interval)
+ : delay_(delay),
+ width_open_interval_(width_open_interval),
+ stroke_open_interval_(stroke_open_interval) {}
+
+void AppMenuAnimation::AppMenuDot::Paint(const gfx::PointF& center_point,
+ SkColor start_color,
+ SkColor severity_color,
+ gfx::Canvas* canvas,
+ const gfx::Rect& bounds,
+ const gfx::SlideAnimation* animation) {
+ bool is_opening = animation->IsShowing();
+ float total_duration = is_opening ? kOpenDuration : kCloseDuration;
+ float width_duration =
+ is_opening ? width_open_interval_ : kWidthStrokeCloseInterval;
+ float stroke_duration =
+ is_opening ? stroke_open_interval_ : kWidthStrokeCloseInterval;
+
+ // Reverse the delay if the animation is closing.
msw 2017/04/13 17:23:12 nit: rephrase this for a bit of clarity, 'reverse
spqchan 2017/04/13 22:52:42 I...got nothing. Hope you don't mind me using your
+ base::TimeDelta delay =
+ is_opening ? delay_
+ : base::TimeDelta::FromMicroseconds(kDotDelayMs * 2) - delay_;
msw 2017/04/13 17:23:12 Should this be FromMilliseconds?
spqchan 2017/04/13 22:52:42 Done.
+ float progress =
+ animation->GetCurrentValue() - (delay.InMillisecondsF() / total_duration);
+
+ float width_progress = 0.0;
+ float stroke_progress = 0.0;
+ float color_progress = 0.0;
+
+ if (progress > 0) {
+ width_progress = std::min(1.0f, progress / width_duration);
+ stroke_progress = std::min(1.0f, progress / stroke_duration);
+
+ if (is_opening) {
+ float color_delay = kColorDelayMs / total_duration;
msw 2017/04/13 17:23:12 nit: should these two values use the 'interval' po
spqchan 2017/04/13 22:52:42 Done.
+ float color_duration = kColorDurationMs / total_duration;
+ if (progress > color_delay) {
+ color_progress =
+ std::min(1.0f, (progress - color_delay) / color_duration);
+ }
+ }
+ }
+
+ float dot_height =
+ gfx::Tween::FloatValueBetween(stroke_progress, kCloseStroke, kOpenStroke);
+ dot_height *= bounds.height();
+
+ float dot_width =
+ gfx::Tween::FloatValueBetween(width_progress, kCloseStroke, kOpenWidth);
+ dot_width *= bounds.width();
+
+ gfx::PointF point = center_point;
+ point.Offset(-dot_width / 2, -dot_height / 2);
+
+ SkColor color = is_opening ? gfx::Tween::ColorValueBetween(
+ color_progress, start_color, severity_color)
+ : severity_color;
+
+ cc::PaintFlags flags;
+ flags.setColor(color);
+ flags.setStrokeWidth(bounds.height() * kCloseStroke);
+ flags.setStrokeCap(cc::PaintFlags::kRound_Cap);
+ flags.setStyle(cc::PaintFlags::kFill_Style);
+ flags.setAntiAlias(true);
+
+ gfx::SizeF dot_size = gfx::SizeF(dot_width, dot_height);
+ canvas->DrawRoundRect(gfx::RectF(point, dot_size), 2.0, flags);
+}
+
+AppMenuAnimation::AppMenuAnimation(AppMenuButton* owner,
+ bool should_animate_closed)
+ : owner_(owner),
+ should_animate_closed_(should_animate_closed),
+ animation_(base::MakeUnique<gfx::SlideAnimation>(this)),
+ bottom_dot_(base::TimeDelta(),
+ kBottomWidthOpenInterval,
+ kBottomStrokeOpenInterval),
+ middle_dot_(base::TimeDelta::FromMicroseconds(kDotDelayMs),
msw 2017/04/13 17:23:12 Should this be FromMilliseconds?
spqchan 2017/04/13 22:52:42 Done.
+ kMiddleWidthOpenInterval,
+ kMiddleStrokeOpenInterval),
+ top_dot_(base::TimeDelta::FromMicroseconds(kDotDelayMs * 2),
msw 2017/04/13 17:23:12 Should this be FromMilliseconds?
spqchan 2017/04/13 22:52:42 Done.
+ kTopWidthOpenInterval,
+ kTopStrokeOpenInterval),
+ start_color_(gfx::kPlaceholderColor),
+ severity_color_(gfx::kPlaceholderColor) {
+ animation_->SetSlideDuration(kOpenDuration);
+ animation_->SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
+}
+
+AppMenuAnimation::~AppMenuAnimation() {}
+
+void AppMenuAnimation::PaintAppMenu(gfx::Canvas* canvas,
+ const gfx::Rect& bounds) {
+ gfx::PointF middle_point = gfx::PointF(bounds.CenterPoint());
+ float y_offset = kDotYOffset * bounds.height();
+ gfx::PointF top_point = middle_point;
+ top_point.Offset(0, -y_offset);
+
+ gfx::PointF bottom_point = middle_point;
+ bottom_point.Offset(0, y_offset);
+
+ middle_dot_.Paint(middle_point, start_color_, severity_color_, canvas, bounds,
+ animation_.get());
+ top_dot_.Paint(top_point, start_color_, severity_color_, canvas, bounds,
+ animation_.get());
+ bottom_dot_.Paint(bottom_point, start_color_, severity_color_, canvas, bounds,
+ animation_.get());
+}
+
+void AppMenuAnimation::SetIconColors(SkColor start_color,
+ SkColor severity_color) {
+ start_color_ = start_color;
+ severity_color_ = severity_color;
+}
+
+void AppMenuAnimation::StartAnimation() {
+ if (!animation_->is_animating()) {
+ animation_->SetSlideDuration(kOpenDuration);
+ animation_->Show();
+ owner_->AppMenuAnimationStarted();
+ }
+}
+
+void AppMenuAnimation::AnimationEnded(const gfx::Animation* animation) {
+ if (animation_->IsShowing() && should_animate_closed_) {
+ animation_->SetSlideDuration(kCloseDuration);
+ animation_->Hide();
+ return;
+ }
+
+ if (!animation_->IsShowing())
+ start_color_ = severity_color_;
+
+ owner_->AppMenuAnimationEnded();
+}
+
+void AppMenuAnimation::AnimationProgressed(const gfx::Animation* animation) {
+ owner_->SchedulePaint();
+}

Powered by Google App Engine
This is Rietveld 408576698