From ac1cba59ca3dcafa013aed34b4ee55870c1373d9 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Tue, 1 Mar 2016 13:03:29 -0800 Subject: [PATCH] updateRenderObject() methods should use the .. pattern Fixes #1381 --- .../flutter/lib/src/material/checkbox.dart | 9 ++-- packages/flutter/lib/src/material/radio.dart | 9 ++-- packages/flutter/lib/src/material/slider.dart | 7 +-- packages/flutter/lib/src/material/switch.dart | 13 ++--- packages/flutter/lib/src/material/tabs.dart | 13 ++--- packages/flutter/lib/src/widgets/basic.dart | 51 +++++++++++-------- .../lib/src/widgets/gesture_detector.dart | 13 ++--- .../lib/src/widgets/performance_overlay.dart | 5 +- .../lib/src/sprite_widget.dart | 5 +- 9 files changed, 71 insertions(+), 54 deletions(-) diff --git a/packages/flutter/lib/src/material/checkbox.dart b/packages/flutter/lib/src/material/checkbox.dart index b4330c2433..e0aa8aa2fa 100644 --- a/packages/flutter/lib/src/material/checkbox.dart +++ b/packages/flutter/lib/src/material/checkbox.dart @@ -75,10 +75,11 @@ class _CheckboxRenderObjectWidget extends LeafRenderObjectWidget { ); void updateRenderObject(_RenderCheckbox renderObject, _CheckboxRenderObjectWidget oldWidget) { - renderObject.value = value; - renderObject.activeColor = activeColor; - renderObject.inactiveColor = inactiveColor; - renderObject.onChanged = onChanged; + renderObject + ..value = value + ..activeColor = activeColor + ..inactiveColor = inactiveColor + ..onChanged = onChanged; } } diff --git a/packages/flutter/lib/src/material/radio.dart b/packages/flutter/lib/src/material/radio.dart index c90b302d17..596edfbfd5 100644 --- a/packages/flutter/lib/src/material/radio.dart +++ b/packages/flutter/lib/src/material/radio.dart @@ -80,10 +80,11 @@ class _RadioRenderObjectWidget extends LeafRenderObjectWidget { ); void updateRenderObject(_RenderRadio renderObject, _RadioRenderObjectWidget oldWidget) { - renderObject.value = selected; - renderObject.activeColor = activeColor; - renderObject.inactiveColor = inactiveColor; - renderObject.onChanged = onChanged; + renderObject + ..value = selected + ..activeColor = activeColor + ..inactiveColor = inactiveColor + ..onChanged = onChanged; } } diff --git a/packages/flutter/lib/src/material/slider.dart b/packages/flutter/lib/src/material/slider.dart index c1197da2bb..7a30510aec 100644 --- a/packages/flutter/lib/src/material/slider.dart +++ b/packages/flutter/lib/src/material/slider.dart @@ -62,9 +62,10 @@ class _SliderRenderObjectWidget extends LeafRenderObjectWidget { ); void updateRenderObject(_RenderSlider renderObject, _SliderRenderObjectWidget oldWidget) { - renderObject.value = value; - renderObject.activeColor = activeColor; - renderObject.onChanged = onChanged; + renderObject + ..value = value + ..activeColor = activeColor + ..onChanged = onChanged; } } diff --git a/packages/flutter/lib/src/material/switch.dart b/packages/flutter/lib/src/material/switch.dart index 57c637e44f..21d73b7773 100644 --- a/packages/flutter/lib/src/material/switch.dart +++ b/packages/flutter/lib/src/material/switch.dart @@ -78,12 +78,13 @@ class _SwitchRenderObjectWidget extends LeafRenderObjectWidget { ); void updateRenderObject(_RenderSwitch renderObject, _SwitchRenderObjectWidget oldWidget) { - renderObject.value = value; - renderObject.activeColor = activeColor; - renderObject.inactiveColor = inactiveColor; - renderObject.activeTrackColor = activeTrackColor; - renderObject.inactiveTrackColor = inactiveTrackColor; - renderObject.onChanged = onChanged; + renderObject + ..value = value + ..activeColor = activeColor + ..inactiveColor = inactiveColor + ..activeTrackColor = activeTrackColor + ..inactiveTrackColor = inactiveTrackColor + ..onChanged = onChanged; } } diff --git a/packages/flutter/lib/src/material/tabs.dart b/packages/flutter/lib/src/material/tabs.dart index 056bd82a71..8c09cc4c71 100644 --- a/packages/flutter/lib/src/material/tabs.dart +++ b/packages/flutter/lib/src/material/tabs.dart @@ -270,12 +270,13 @@ class _TabBarWrapper extends MultiChildRenderObjectWidget { } void updateRenderObject(_RenderTabBar renderObject, _TabBarWrapper oldWidget) { - renderObject.selectedIndex = selectedIndex; - renderObject.indicatorColor = indicatorColor; - renderObject.indicatorRect = indicatorRect; - renderObject.textAndIcons = textAndIcons; - renderObject.isScrollable = isScrollable; - renderObject.onLayoutChanged = onLayoutChanged; + renderObject + ..selectedIndex = selectedIndex + ..indicatorColor = indicatorColor + ..indicatorRect = indicatorRect + ..textAndIcons = textAndIcons + ..isScrollable = isScrollable + ..onLayoutChanged = onLayoutChanged; } } diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart index 553e093ab8..016ea7e41e 100644 --- a/packages/flutter/lib/src/widgets/basic.dart +++ b/packages/flutter/lib/src/widgets/basic.dart @@ -102,8 +102,9 @@ class ShaderMask extends OneChildRenderObjectWidget { } void updateRenderObject(RenderShaderMask renderObject, ShaderMask oldWidget) { - renderObject.shaderCallback = shaderCallback; - renderObject.transferMode = transferMode; + renderObject + ..shaderCallback = shaderCallback + ..transferMode = transferMode; } } @@ -132,8 +133,9 @@ class DecoratedBox extends OneChildRenderObjectWidget { RenderDecoratedBox createRenderObject() => new RenderDecoratedBox(decoration: decoration, position: position); void updateRenderObject(RenderDecoratedBox renderObject, DecoratedBox oldWidget) { - renderObject.decoration = decoration; - renderObject.position = position; + renderObject + ..decoration = decoration + ..position = position; } } @@ -166,13 +168,15 @@ class CustomPaint extends OneChildRenderObjectWidget { ); void updateRenderObject(RenderCustomPaint renderObject, CustomPaint oldWidget) { - renderObject.painter = painter; - renderObject.foregroundPainter = foregroundPainter; + renderObject + ..painter = painter + ..foregroundPainter = foregroundPainter; } void didUnmountRenderObject(RenderCustomPaint renderObject) { - renderObject.painter = null; - renderObject.foregroundPainter = null; + renderObject + ..painter = null + ..foregroundPainter = null; } } @@ -220,8 +224,9 @@ class ClipRRect extends OneChildRenderObjectWidget { RenderClipRRect createRenderObject() => new RenderClipRRect(xRadius: xRadius, yRadius: yRadius); void updateRenderObject(RenderClipRRect renderObject, ClipRRect oldWidget) { - renderObject.xRadius = xRadius; - renderObject.yRadius = yRadius; + renderObject + ..xRadius = xRadius + ..yRadius = yRadius; } } @@ -283,10 +288,11 @@ class Transform extends OneChildRenderObjectWidget { ); void updateRenderObject(RenderTransform renderObject, Transform oldWidget) { - renderObject.transform = transform; - renderObject.origin = origin; - renderObject.alignment = alignment; - renderObject.transformHitTests = transformHitTests; + renderObject + ..transform = transform + ..origin = origin + ..alignment = alignment + ..transformHitTests = transformHitTests; } } @@ -307,8 +313,9 @@ class FractionalTranslation extends OneChildRenderObjectWidget { RenderFractionalTranslation createRenderObject() => new RenderFractionalTranslation(translation: translation, transformHitTests: transformHitTests); void updateRenderObject(RenderFractionalTranslation renderObject, FractionalTranslation oldWidget) { - renderObject.translation = translation; - renderObject.transformHitTests = transformHitTests; + renderObject + ..translation = translation + ..transformHitTests = transformHitTests; } } @@ -381,9 +388,10 @@ class Align extends OneChildRenderObjectWidget { RenderPositionedBox createRenderObject() => new RenderPositionedBox(alignment: alignment, widthFactor: widthFactor, heightFactor: heightFactor); void updateRenderObject(RenderPositionedBox renderObject, Align oldWidget) { - renderObject.alignment = alignment; - renderObject.widthFactor = widthFactor; - renderObject.heightFactor = heightFactor; + renderObject + ..alignment = alignment + ..widthFactor = widthFactor + ..heightFactor = heightFactor; } } @@ -563,8 +571,9 @@ class FractionallySizedBox extends OneChildRenderObjectWidget { ); void updateRenderObject(RenderFractionallySizedBox renderObject, FractionallySizedBox oldWidget) { - renderObject.widthFactor = width; - renderObject.heightFactor = height; + renderObject + ..widthFactor = width + ..heightFactor = height; } void debugFillDescription(List description) { diff --git a/packages/flutter/lib/src/widgets/gesture_detector.dart b/packages/flutter/lib/src/widgets/gesture_detector.dart index 68d4eee987..56dfb22cb1 100644 --- a/packages/flutter/lib/src/widgets/gesture_detector.dart +++ b/packages/flutter/lib/src/widgets/gesture_detector.dart @@ -450,11 +450,12 @@ class _GestureSemantics extends OneChildRenderObjectWidget { void updateRenderObject(RenderSemanticsGestureHandler renderObject, _GestureSemantics oldWidget) { Map recognizers = owner._recognizers; - renderObject.onTap = recognizers.containsKey(TapGestureRecognizer) ? _handleTap : null; - renderObject.onLongPress = recognizers.containsKey(LongPressGestureRecognizer) ? _handleLongPress : null; - renderObject.onHorizontalDragUpdate = recognizers.containsKey(VerticalDragGestureRecognizer) || - recognizers.containsKey(PanGestureRecognizer) ? _handleHorizontalDragUpdate : null; - renderObject.onVerticalDragUpdate = recognizers.containsKey(VerticalDragGestureRecognizer) || - recognizers.containsKey(PanGestureRecognizer) ? _handleVerticalDragUpdate : null; + renderObject + ..onTap = recognizers.containsKey(TapGestureRecognizer) ? _handleTap : null + ..onLongPress = recognizers.containsKey(LongPressGestureRecognizer) ? _handleLongPress : null + ..onHorizontalDragUpdate = recognizers.containsKey(VerticalDragGestureRecognizer) || + recognizers.containsKey(PanGestureRecognizer) ? _handleHorizontalDragUpdate : null + ..onVerticalDragUpdate = recognizers.containsKey(VerticalDragGestureRecognizer) || + recognizers.containsKey(PanGestureRecognizer) ? _handleVerticalDragUpdate : null; } } diff --git a/packages/flutter/lib/src/widgets/performance_overlay.dart b/packages/flutter/lib/src/widgets/performance_overlay.dart index 9e822faa30..1f073ae20d 100644 --- a/packages/flutter/lib/src/widgets/performance_overlay.dart +++ b/packages/flutter/lib/src/widgets/performance_overlay.dart @@ -62,7 +62,8 @@ class PerformanceOverlay extends LeafRenderObjectWidget { ); void updateRenderObject(RenderPerformanceOverlay renderObject, RenderObjectWidget oldWidget) { - renderObject.optionsMask = optionsMask; - renderObject.rasterizerThreshold = rasterizerThreshold; + renderObject + ..optionsMask = optionsMask + ..rasterizerThreshold = rasterizerThreshold; } } diff --git a/packages/flutter_sprites/lib/src/sprite_widget.dart b/packages/flutter_sprites/lib/src/sprite_widget.dart index 4c71605831..0b9c2a482d 100644 --- a/packages/flutter_sprites/lib/src/sprite_widget.dart +++ b/packages/flutter_sprites/lib/src/sprite_widget.dart @@ -27,7 +27,8 @@ class SpriteWidget extends OneChildRenderObjectWidget { SpriteBox createRenderObject() => new SpriteBox(rootNode, transformMode); void updateRenderObject(SpriteBox renderObject, SpriteWidget oldWidget) { - renderObject.rootNode = rootNode; - renderObject.transformMode = transformMode; + renderObject + ..rootNode = rootNode + ..transformMode = transformMode; } }