me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove border_width support in slider::Rail

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-04-12 05:21:46 +02:00
parent 45cfce3f6d
commit c2cc9a835d
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
4 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
native/src/widget/slider.rs
View file

@ -8,8 +8,8 @@ use crate::renderer;
use crate::touch; use crate::touch;
use crate::widget::tree::{self, Tree}; use crate::widget::tree::{self, Tree};
use crate::{ use crate::{
Clipboard, Element, Layout, Length, Pixels, Point, Rectangle, Shell, Size, Clipboard, Color, Element, Layout, Length, Pixels, Point, Rectangle, Shell,
Widget, Size, Widget,
}; };
use std::ops::RangeInclusive; use std::ops::RangeInclusive;
@ -412,8 +412,8 @@ pub fn draw<T, R>(
style.rail.border_radius, style.rail.border_radius,
] ]
.into(), .into(),
border_width: style.rail.border_width, border_width: 0.0,
border_color: style.rail.border_color, border_color: Color::TRANSPARENT,
}, },
style.rail.colors.0, style.rail.colors.0,
); );
@ -433,8 +433,8 @@ pub fn draw<T, R>(
0.0, 0.0,
] ]
.into(), .into(),
border_width: style.rail.border_width, border_width: 0.0,
border_color: style.rail.border_color, border_color: Color::TRANSPARENT,
}, },
style.rail.colors.1, style.rail.colors.1,
); );

12
native/src/widget/vertical_slider.rs
View file

@ -8,8 +8,8 @@ pub use iced_style::slider::{Appearance, Handle, HandleShape, StyleSheet};
use crate::event::{self, Event}; use crate::event::{self, Event};
use crate::widget::tree::{self, Tree}; use crate::widget::tree::{self, Tree};
use crate::{ use crate::{
layout, mouse, renderer, touch, Clipboard, Element, Layout, Length, Pixels, layout, mouse, renderer, touch, Clipboard, Color, Element, Layout, Length,
Point, Rectangle, Shell, Size, Widget, Pixels, Point, Rectangle, Shell, Size, Widget,
}; };
/// An vertical bar and a handle that selects a single value from a range of /// An vertical bar and a handle that selects a single value from a range of
@ -405,8 +405,8 @@ pub fn draw<T, R>(
0.0, 0.0,
] ]
.into(), .into(),
border_width: style.rail.border_width, border_width: 0.0,
border_color: style.rail.border_color, border_color: Color::TRANSPARENT,
}, },
style.rail.colors.1, style.rail.colors.1,
); );
@ -426,8 +426,8 @@ pub fn draw<T, R>(
style.rail.border_radius, style.rail.border_radius,
] ]
.into(), .into(),
border_width: style.rail.border_width, border_width: 0.0,
border_color: style.rail.border_color, border_color: Color::TRANSPARENT,
}, },
style.rail.colors.0, style.rail.colors.0,
); );

4
style/src/slider.rs
View file

@ -19,10 +19,6 @@ pub struct Rail {
pub size: f32, pub size: f32,
/// The border radius of the slider. /// The border radius of the slider.
pub border_radius: f32, pub border_radius: f32,
/// The border width of the slider.
pub border_width: f32,
/// The border [`Color`] of the slider.
pub border_color: Color,
} }
/// The appearance of the handle of a slider. /// The appearance of the handle of a slider.

2
style/src/theme.rs
View file

@ -423,8 +423,6 @@ impl slider::StyleSheet for Theme {
), ),
size: 2.0, size: 2.0,
border_radius: 0.0, border_radius: 0.0,
border_width: 0.0,
border_color: Color::TRANSPARENT,
}, },
handle: slider::Handle { handle: slider::Handle {
color: palette.background.base.color, color: palette.background.base.color,