commit 6656d5122ad670344f427fd31803763d4e5fd102
author Ian Hickson <github.com@spam.hixie.ch> Mon Aug 17 23:08:12 2015
committer Ian Hickson <github.com@spam.hixie.ch> Mon Aug 17 23:08:12 2015
tree 7bf1e6bab95031adbb2f151b3f0a5bcb53009b8a
parent 173a33ae6eaa9d5df1461cd630178e345698a9c6
parent 9e8074528e5677f29f367e9f2cfce352d6881e6c

Merge pull request #640 from Hixie/lerp-whitespace

Improve style in lerp.dart and box_painter.dart

sky/packages/sky/lib/base/lerp.dart

diff --git a/sky/packages/sky/lib/base/lerp.dart b/sky/packages/sky/lib/base/lerp.dart
index 80e2a2c..da5c144 100644
--- a/sky/packages/sky/lib/base/lerp.dart
+++ b/sky/packages/sky/lib/base/lerp.dart
@@ -26,10 +26,11 @@
   if (b == null)
     return _scaleAlpha(a, 1.0 - t);
   return new Color.fromARGB(
-      lerpNum(a.alpha, b.alpha, t).toInt(),
-      lerpNum(a.red, b.red, t).toInt(),
-      lerpNum(a.green, b.green, t).toInt(),
-      lerpNum(a.blue, b.blue, t).toInt());
+    lerpNum(a.alpha, b.alpha, t).toInt(),
+    lerpNum(a.red, b.red, t).toInt(),
+    lerpNum(a.green, b.green, t).toInt(),
+    lerpNum(a.blue, b.blue, t).toInt()
+  );
 }
 
 Offset lerpOffset(Offset a, Offset b, double t) {
@@ -55,5 +56,6 @@
     lerpNum(a.left, b.left, t),
     lerpNum(a.top, b.top, t),
     lerpNum(a.right, b.right, t),
-    lerpNum(a.bottom, b.bottom, t));
+    lerpNum(a.bottom, b.bottom, t)
+  );
 }

sky/packages/sky/lib/painting/box_painter.dart

diff --git a/sky/packages/sky/lib/painting/box_painter.dart b/sky/packages/sky/lib/painting/box_painter.dart
index 7cc5054..251aea7 100644
--- a/sky/packages/sky/lib/painting/box_painter.dart
+++ b/sky/packages/sky/lib/painting/box_painter.dart
@@ -91,9 +91,10 @@
   if (b == null)
     return a.scale(1.0 - t);
   return new BoxShadow(
-      color: lerpColor(a.color, b.color, t),
-      offset: lerpOffset(a.offset, b.offset, t),
-      blur: lerpNum(a.blur, b.blur, t));
+    color: lerpColor(a.color, b.color, t),
+    offset: lerpOffset(a.offset, b.offset, t),
+    blur: lerpNum(a.blur, b.blur, t)
+  );
 }
 
 List<BoxShadow> lerpListBoxShadow(List<BoxShadow> a, List<BoxShadow> b, double t) {
@@ -126,18 +127,19 @@
     this.tileMode: sky.TileMode.clamp
   });
 
-  String toString() =>
-      'LinearGradient($endPoints, $colors, $colorStops, $tileMode)';
-
-  sky.Shader createShader() {
-    return new sky.Gradient.linear(this.endPoints, this.colors, this.colorStops,
-                                   this.tileMode);
-  }
-
   final List<Point> endPoints;
   final List<Color> colors;
   final List<double> colorStops;
   final sky.TileMode tileMode;
+
+  sky.Shader createShader() {
+    return new sky.Gradient.linear(this.endPoints, this.colors,
+                                   this.colorStops, this.tileMode);
+  }
+
+  String toString() {
+    return 'LinearGradient($endPoints, $colors, $colorStops, $tileMode)';
+  }
 }
 
 class RadialGradient extends Gradient {
@@ -149,19 +151,20 @@
     this.tileMode: sky.TileMode.clamp
   });
 
-  String toString() =>
-      'RadialGradient($center, $radius, $colors, $colorStops, $tileMode)';
+  final Point center;
+  final double radius;
+  final List<Color> colors;
+  final List<double> colorStops;
+  final sky.TileMode tileMode;
 
   sky.Shader createShader() {
     return new sky.Gradient.radial(this.center, this.radius, this.colors,
                                    this.colorStops, this.tileMode);
   }
 
-  final Point center;
-  final double radius;
-  final List<Color> colors;
-  final List<double> colorStops;
-  final sky.TileMode tileMode;
+  String toString() {
+    return 'RadialGradient($center, $radius, $colors, $colorStops, $tileMode)';
+  }
 }
 
 enum BackgroundFit { fill, contain, cover, none, scaleDown }
@@ -358,7 +361,8 @@
   }
 
   void _paintBackgroundColor(sky.Canvas canvas, Rect rect) {
-    if (_decoration.backgroundColor != null || _decoration.boxShadow != null ||
+    if (_decoration.backgroundColor != null ||
+        _decoration.boxShadow != null ||
         _decoration.gradient != null) {
       switch (_decoration.shape) {
         case Shape.circle: