Fixed animation for setBounds.

Author: martin-world1977

docs/api/base-view.md

@@ -147,8 +147,9 @@ Objects created with `new BaseView` have the following instance methods:
 
 #### `view.setBounds(bounds[, options])` _Experimental_
 
-* `bounds` [Rectangle](structures/rectangle.md) - The position and size of the view, relative to its parent.
+* `bounds` [Rectangle](structures/rectangle.md) - The target position and size of the view, relative to its parent.
 * `options` Object (optional)
+  * `fromBounds` [Rectangle](structures/rectangle.md) (optional) - The initial position and size of the view, relative to its parent.
   * `duration` Float (optional) - A duration of the animation (in seconds). Default is 1.0.
   * `timingFunction` string (optional) - One of the following values: `linear`, `easeIn`, `easeOut`, `easeInEaseOut`, `default`. Default is `linear`.
   * `timingControlPoints` Object (optional)

docs/api/browser-view.md

@@ -65,6 +65,7 @@ Objects created with `new BrowserView` have the following instance methods:
 
 * `bounds` [Rectangle](structures/rectangle.md)
 * `options` Object (optional)
+  * `fromBounds` [Rectangle](structures/rectangle.md) (optional) - The initial position and size of the view, relative to its parent.
   * `duration` Float (optional) - A duration of the animation (in seconds). Default is 1.0.
   * `timingFunction` string (optional) - One of the following values: `linear`, `easeIn`, `easeOut`, `easeInEaseOut`, `default`. Default is `linear`.
   * `timingControlPoints` Object (optional)

shell/browser/ui/cocoa/electron_native_view.h

@@ -73,11 +73,11 @@ struct NativeViewPrivate {
 @property(strong, nonatomic) NSColor* _tintColor;
 
 //* To get more vibrant colors, a filter to increase the saturation of the
-//colors can be applied. The default value is 2.5.
+// colors can be applied. The default value is 2.5.
 @property(assign, nonatomic) float _saturationFactor;
 
 //* The blur radius defines the strength of the Gaussian Blur filter. The
-//default value is 20.0.
+// default value is 20.0.
 @property(assign, nonatomic) float _blurRadius;
 
 @end

shell/browser/ui/native_view_mac.mm

@@ -122,9 +122,6 @@ EventType EventTypeFromNS(NSEvent* event) {
 void NativeView::SetBounds(const gfx::Rect& bounds,
                            const gin_helper::Dictionary& options) {
   SetBoundsForView(view_, bounds, options);
-  NSRect frame = bounds.ToCGRect();
-  // Calling setFrame manually does not trigger resizeSubviewsWithOldSize.
-  [view_ resizeSubviewsWithOldSize:frame.size];
 }
 
 gfx::Rect NativeView::GetBounds() const {

shell/browser/ui/view_utils_mac.mm

@@ -7,6 +7,7 @@
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "shell/common/gin_converters/gfx_converter.h"
 #include "shell/common/gin_helper/dictionary.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ -42,6 +43,7 @@ void SetBoundsForView(NSView* view,
   std::string tfunction_name;
   float cx1 = 0.0, cy1 = 0.0, cx2 = 1.0, cy2 = 1.0;
   bool use_control_points = false;
+  gfx::Rect from_bounds;
   if (options.Get("duration", &duration))
     animation = true;
   if (options.Get("timingFunction", &tfunction_name)) {
@@ -63,16 +65,30 @@ void SetBoundsForView(NSView* view,
   auto* superview = view.superview;
   if (superview && ![superview isFlipped]) {
     const auto superview_height = superview.frame.size.height;
-    frame =
-        NSMakeRect(bounds.x(), superview_height - bounds.y() - bounds.height(),
-                   bounds.width(), bounds.height());
+    frame.origin.y = superview_height - bounds.y() - bounds.height();
   }
 
   if (!animation) {
-    view.frame = frame;
+    [view setFrame:frame];
+    [view setNeedsDisplay:YES];
+    // Calling setFrame manually does not trigger resizeSubviewsWithOldSize.
+    [view resizeSubviewsWithOldSize:frame.size];
     return;
   }
 
+  NSRect fromFrame = view.frame;
+  if (options.Get("fromBounds", &from_bounds)) {
+    if (superview && ![superview isFlipped]) {
+      const auto superview_height = superview.frame.size.height;
+      fromFrame =
+          NSMakeRect(from_bounds.x(),
+                     superview_height - from_bounds.y() - from_bounds.height(),
+                     from_bounds.width(), from_bounds.height());
+    } else {
+      fromFrame = from_bounds.ToCGRect();
+    }
+  }
+
   CAMediaTimingFunction* timing_function = nil;
   if (!use_control_points) {
     CAMediaTimingFunctionName timing_function_name =
@@ -95,15 +111,29 @@ void SetBoundsForView(NSView* view,
         [[CAMediaTimingFunction alloc] initWithControlPoints:cx1:cy1:cx2:cy2];
   }
 
-  [NSAnimationContext
-      runAnimationGroup:^(NSAnimationContext* context) {
-        context.duration = duration;
-        context.timingFunction = timing_function;
-        // Trigger the animation
-        view.animator.frame = frame;
-      }
-      completionHandler:^{
-      }];
+  CABasicAnimation* positionAnimation =
+      [CABasicAnimation animationWithKeyPath:@"position"];
+  positionAnimation.duration = duration;
+  positionAnimation.timingFunction = timing_function;
+  positionAnimation.fromValue = @(fromFrame.origin);
+  positionAnimation.toValue = @(frame.origin);
+  if (fromFrame.size.width == frame.size.width &&
+      fromFrame.size.height == frame.size.height) {
+    [view.layer addAnimation:positionAnimation forKey:@"position"];
+  } else {
+    CABasicAnimation* sizeAnimation =
+        [CABasicAnimation animationWithKeyPath:@"bounds.size"];
+    sizeAnimation.duration = duration;
+    sizeAnimation.timingFunction = timing_function;
+    sizeAnimation.fromValue = @(fromFrame.size);
+    sizeAnimation.toValue = @(frame.size);
+    CAAnimationGroup* group = [CAAnimationGroup animation];
+    group.duration = duration;
+    group.timingFunction = timing_function;
+    group.animations = @[ positionAnimation, sizeAnimation ];
+    [view.layer addAnimation:group forKey:@"allMyAnimations"];
+  }
+  [view setFrame:frame];
 }
 
 void ResetScalingForView(NSView* view) {