Unverified Commit 7a787419 authored by Greg Spencer's avatar Greg Spencer Committed by GitHub

Revert "Changing the slider thumb size." (#16541)

This reverts commit 6494ab23f6a063c689441f55c3aba1b3c8e26b5b.
parent a561722b
...@@ -562,7 +562,7 @@ class RoundSliderThumbShape extends SliderComponentShape { ...@@ -562,7 +562,7 @@ class RoundSliderThumbShape extends SliderComponentShape {
/// Create a slider thumb that draws a circle. /// Create a slider thumb that draws a circle.
const RoundSliderThumbShape(); const RoundSliderThumbShape();
static const double _thumbRadius = 10.0; static const double _thumbRadius = 6.0;
static const double _disabledThumbRadius = 4.0; static const double _disabledThumbRadius = 4.0;
@override @override
......
...@@ -998,7 +998,7 @@ void main() { ...@@ -998,7 +998,7 @@ void main() {
..circle(x: 400.0, y: 16.0, radius: 1.0) ..circle(x: 400.0, y: 16.0, radius: 1.0)
..circle(x: 591.5, y: 16.0, radius: 1.0) ..circle(x: 591.5, y: 16.0, radius: 1.0)
..circle(x: 783.0, y: 16.0, radius: 1.0) ..circle(x: 783.0, y: 16.0, radius: 1.0)
..circle(x: 16.0, y: 16.0, radius: 10.0), ..circle(x: 16.0, y: 16.0, radius: 6.0),
); );
gesture = await tester.startGesture(center); gesture = await tester.startGesture(center);
...@@ -1015,7 +1015,7 @@ void main() { ...@@ -1015,7 +1015,7 @@ void main() {
..circle(x: 400.0, y: 16.0, radius: 1.0) ..circle(x: 400.0, y: 16.0, radius: 1.0)
..circle(x: 591.5, y: 16.0, radius: 1.0) ..circle(x: 591.5, y: 16.0, radius: 1.0)
..circle(x: 783.0, y: 16.0, radius: 1.0) ..circle(x: 783.0, y: 16.0, radius: 1.0)
..circle(x: 105.0625, y: 16.0, radius: 10.0), ..circle(x: 105.0625, y: 16.0, radius: 6.0),
); );
// Reparenting in the middle of an animation should do nothing. // Reparenting in the middle of an animation should do nothing.
...@@ -1035,7 +1035,7 @@ void main() { ...@@ -1035,7 +1035,7 @@ void main() {
..circle(x: 400.0, y: 16.0, radius: 1.0) ..circle(x: 400.0, y: 16.0, radius: 1.0)
..circle(x: 591.5, y: 16.0, radius: 1.0) ..circle(x: 591.5, y: 16.0, radius: 1.0)
..circle(x: 783.0, y: 16.0, radius: 1.0) ..circle(x: 783.0, y: 16.0, radius: 1.0)
..circle(x: 185.5457763671875, y: 16.0, radius: 10.0), ..circle(x: 185.5457763671875, y: 16.0, radius: 6.0),
); );
// Wait for animations to finish. // Wait for animations to finish.
await tester.pumpAndSettle(); await tester.pumpAndSettle();
...@@ -1048,7 +1048,7 @@ void main() { ...@@ -1048,7 +1048,7 @@ void main() {
..circle(x: 208.5, y: 16.0, radius: 1.0) ..circle(x: 208.5, y: 16.0, radius: 1.0)
..circle(x: 591.5, y: 16.0, radius: 1.0) ..circle(x: 591.5, y: 16.0, radius: 1.0)
..circle(x: 783.0, y: 16.0, radius: 1.0) ..circle(x: 783.0, y: 16.0, radius: 1.0)
..circle(x: 400.0, y: 16.0, radius: 10.0), ..circle(x: 400.0, y: 16.0, radius: 6.0),
); );
await gesture.up(); await gesture.up();
await tester.pumpAndSettle(); await tester.pumpAndSettle();
...@@ -1060,7 +1060,7 @@ void main() { ...@@ -1060,7 +1060,7 @@ void main() {
..circle(x: 208.5, y: 16.0, radius: 1.0) ..circle(x: 208.5, y: 16.0, radius: 1.0)
..circle(x: 591.5, y: 16.0, radius: 1.0) ..circle(x: 591.5, y: 16.0, radius: 1.0)
..circle(x: 783.0, y: 16.0, radius: 1.0) ..circle(x: 783.0, y: 16.0, radius: 1.0)
..circle(x: 400.0, y: 16.0, radius: 10.0), ..circle(x: 400.0, y: 16.0, radius: 6.0),
); );
} }
......
...@@ -198,7 +198,7 @@ void main() { ...@@ -198,7 +198,7 @@ void main() {
final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider)); final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
expect(sliderBox, paints..circle(color: sliderTheme.thumbColor, radius: 10.0)); expect(sliderBox, paints..circle(color: sliderTheme.thumbColor, radius: 6.0));
await tester.pumpWidget(buildApp(enabled: false)); await tester.pumpWidget(buildApp(enabled: false));
await tester.pumpAndSettle(); // wait for disable animation await tester.pumpAndSettle(); // wait for disable animation
...@@ -213,7 +213,7 @@ void main() { ...@@ -213,7 +213,7 @@ void main() {
..circle(color: sliderTheme.activeTickMarkColor) ..circle(color: sliderTheme.activeTickMarkColor)
..circle(color: sliderTheme.inactiveTickMarkColor) ..circle(color: sliderTheme.inactiveTickMarkColor)
..circle(color: sliderTheme.inactiveTickMarkColor) ..circle(color: sliderTheme.inactiveTickMarkColor)
..circle(color: sliderTheme.thumbColor, radius: 10.0)); ..circle(color: sliderTheme.thumbColor, radius: 6.0));
await tester.pumpWidget(buildApp(divisions: 3, enabled: false)); await tester.pumpWidget(buildApp(divisions: 3, enabled: false));
await tester.pumpAndSettle(); // wait for disable animation await tester.pumpAndSettle(); // wait for disable animation
......
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