Unverified Commit 74d403a2 authored by Abhishek Ghaskata's avatar Abhishek Ghaskata Committed by GitHub

Change elevation to double of MergeableMaterial (#81634)

parent 33b183e6
...@@ -560,7 +560,7 @@ class _ExpansionPanelListState extends State<ExpansionPanelList> { ...@@ -560,7 +560,7 @@ class _ExpansionPanelListState extends State<ExpansionPanelList> {
return MergeableMaterial( return MergeableMaterial(
hasDividers: true, hasDividers: true,
dividerColor: widget.dividerColor, dividerColor: widget.dividerColor,
elevation: widget.elevation, elevation: widget.elevation.toDouble(),
children: items, children: items,
); );
} }
......
...@@ -123,8 +123,7 @@ class MergeableMaterial extends StatefulWidget { ...@@ -123,8 +123,7 @@ class MergeableMaterial extends StatefulWidget {
/// The z-coordinate at which to place all the [Material] slices. /// The z-coordinate at which to place all the [Material] slices.
/// ///
/// Defaults to 2, the appropriate elevation for cards. /// Defaults to 2, the appropriate elevation for cards.
// TODO(ianh): Change this to double. final double elevation;
final int elevation;
/// Whether connected pieces of [MaterialSlice] have dividers between them. /// Whether connected pieces of [MaterialSlice] have dividers between them.
final bool hasDividers; final bool hasDividers;
...@@ -139,7 +138,7 @@ class MergeableMaterial extends StatefulWidget { ...@@ -139,7 +138,7 @@ class MergeableMaterial extends StatefulWidget {
void debugFillProperties(DiagnosticPropertiesBuilder properties) { void debugFillProperties(DiagnosticPropertiesBuilder properties) {
super.debugFillProperties(properties); super.debugFillProperties(properties);
properties.add(EnumProperty<Axis>('mainAxis', mainAxis)); properties.add(EnumProperty<Axis>('mainAxis', mainAxis));
properties.add(DoubleProperty('elevation', elevation.toDouble())); properties.add(DoubleProperty('elevation', elevation));
} }
@override @override
...@@ -616,7 +615,7 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid ...@@ -616,7 +615,7 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
return _MergeableMaterialListBody( return _MergeableMaterialListBody(
mainAxis: widget.mainAxis, mainAxis: widget.mainAxis,
elevation: widget.elevation.toDouble(), elevation: widget.elevation,
items: _children, items: _children,
children: widgets, children: widgets,
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment