Merge pull request #3382 from Jacalz/3381-slider-track-colour

fyne-io · Nov 6, 2022 · cae867c · cae867c
2 parents 3b2b181 + ddc9d06
commit cae867c
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 7 deletions.
diff --git a/dialog/testdata/color/channel_layout_foobar_0.png b/dialog/testdata/color/channel_layout_foobar_0.png
diff --git a/dialog/testdata/color/channel_layout_foobar_50.png b/dialog/testdata/color/channel_layout_foobar_50.png
diff --git a/dialog/testdata/color/dialog_expanded_theme_default.png b/dialog/testdata/color/dialog_expanded_theme_default.png
diff --git a/dialog/testdata/color/picker_layout_advanced.png b/dialog/testdata/color/picker_layout_advanced.png
diff --git a/driver/software/testdata/canvas.png b/driver/software/testdata/canvas.png
diff --git a/driver/software/testdata/canvas_mobile.png b/driver/software/testdata/canvas_mobile.png
diff --git a/widget/slider.go b/widget/slider.go
@@ -193,11 +193,9 @@ func (s *Slider) MinSize() fyne.Size {
 // CreateRenderer links this widget to its renderer.
 func (s *Slider) CreateRenderer() fyne.WidgetRenderer {
 	s.ExtendBaseWidget(s)
-	track := canvas.NewRectangle(theme.ShadowColor())
+	track := canvas.NewRectangle(theme.InputBackgroundColor())
 	active := canvas.NewRectangle(theme.ForegroundColor())
-	thumb := &canvas.Circle{
-		FillColor:   theme.ForegroundColor(),
-		StrokeWidth: 0}
+	thumb := &canvas.Circle{FillColor: theme.ForegroundColor()}
 
 	objects := []fyne.CanvasObject{track, active, thumb}
 
@@ -271,7 +269,7 @@ type sliderRenderer struct {
 
 // Refresh updates the widget state for drawing.
 func (s *sliderRenderer) Refresh() {
-	s.track.FillColor = theme.ShadowColor()
+	s.track.FillColor = theme.InputBackgroundColor()
 	s.thumb.FillColor = theme.ForegroundColor()
 	s.active.FillColor = theme.ForegroundColor()
 

diff --git a/widget/testdata/slider/horizontal.xml b/widget/testdata/slider/horizontal.xml
@@ -1,7 +1,7 @@
 <canvas padded size="220x50">
 	<content>
 		<widget pos="6,6" size="208x38" type="*widget.Slider">
-			<rectangle fillColor="shadow" pos="14,18" size="178x2"/>
+			<rectangle fillColor="inputBackground" pos="14,18" size="178x2"/>
 			<rectangle fillColor="foreground" pos="14,18" size="0x2"/>
 			<circle fillColor="foreground" pos="6,10" size="16x16"/>
 		</widget>

diff --git a/widget/testdata/slider/vertical.xml b/widget/testdata/slider/vertical.xml
@@ -1,7 +1,7 @@
 <canvas padded size="50x220">
 	<content>
 		<widget pos="6,6" size="38x208" type="*widget.Slider">
-			<rectangle fillColor="shadow" pos="18,14" size="2x178"/>
+			<rectangle fillColor="inputBackground" pos="18,14" size="2x178"/>
 			<rectangle fillColor="foreground" pos="18,193" size="2x0"/>
 			<circle fillColor="foreground" pos="10,185" size="16x16"/>
 		</widget>