Merge pull request #1892 from casperstorm/feat/slider-rail-border-radius
Add `border_radius` to slider rail
This commit is contained in:
commit
b353767d2d
4 changed files with 9 additions and 6 deletions
|
|
@ -17,6 +17,8 @@ pub struct Rail {
|
||||||
pub colors: (Color, Color),
|
pub colors: (Color, Color),
|
||||||
/// The width of the stroke of a slider rail.
|
/// The width of the stroke of a slider rail.
|
||||||
pub width: f32,
|
pub width: f32,
|
||||||
|
/// The border radius of the corners of the rail.
|
||||||
|
pub border_radius: BorderRadius,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The appearance of the handle of a slider.
|
/// The appearance of the handle of a slider.
|
||||||
|
|
|
||||||
|
|
@ -433,9 +433,10 @@ impl slider::StyleSheet for Theme {
|
||||||
rail: slider::Rail {
|
rail: slider::Rail {
|
||||||
colors: (
|
colors: (
|
||||||
palette.primary.base.color,
|
palette.primary.base.color,
|
||||||
palette.primary.base.color,
|
palette.secondary.base.color,
|
||||||
),
|
),
|
||||||
width: 2.0,
|
width: 4.0,
|
||||||
|
border_radius: 2.0.into(),
|
||||||
},
|
},
|
||||||
handle: slider::Handle {
|
handle: slider::Handle {
|
||||||
color: palette.background.base.color,
|
color: palette.background.base.color,
|
||||||
|
|
|
||||||
|
|
@ -403,7 +403,7 @@ pub fn draw<T, R>(
|
||||||
width: offset + handle_width / 2.0,
|
width: offset + handle_width / 2.0,
|
||||||
height: style.rail.width,
|
height: style.rail.width,
|
||||||
},
|
},
|
||||||
border_radius: Default::default(),
|
border_radius: style.rail.border_radius,
|
||||||
border_width: 0.0,
|
border_width: 0.0,
|
||||||
border_color: Color::TRANSPARENT,
|
border_color: Color::TRANSPARENT,
|
||||||
},
|
},
|
||||||
|
|
@ -418,7 +418,7 @@ pub fn draw<T, R>(
|
||||||
width: bounds.width - offset - handle_width / 2.0,
|
width: bounds.width - offset - handle_width / 2.0,
|
||||||
height: style.rail.width,
|
height: style.rail.width,
|
||||||
},
|
},
|
||||||
border_radius: Default::default(),
|
border_radius: style.rail.border_radius,
|
||||||
border_width: 0.0,
|
border_width: 0.0,
|
||||||
border_color: Color::TRANSPARENT,
|
border_color: Color::TRANSPARENT,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -401,7 +401,7 @@ pub fn draw<T, R>(
|
||||||
width: style.rail.width,
|
width: style.rail.width,
|
||||||
height: offset + handle_width / 2.0,
|
height: offset + handle_width / 2.0,
|
||||||
},
|
},
|
||||||
border_radius: Default::default(),
|
border_radius: style.rail.border_radius,
|
||||||
border_width: 0.0,
|
border_width: 0.0,
|
||||||
border_color: Color::TRANSPARENT,
|
border_color: Color::TRANSPARENT,
|
||||||
},
|
},
|
||||||
|
|
@ -416,7 +416,7 @@ pub fn draw<T, R>(
|
||||||
width: style.rail.width,
|
width: style.rail.width,
|
||||||
height: bounds.height - offset - handle_width / 2.0,
|
height: bounds.height - offset - handle_width / 2.0,
|
||||||
},
|
},
|
||||||
border_radius: Default::default(),
|
border_radius: style.rail.border_radius,
|
||||||
border_width: 0.0,
|
border_width: 0.0,
|
||||||
border_color: Color::TRANSPARENT,
|
border_color: Color::TRANSPARENT,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue