leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

scrollable: have scroller use Background instead of Color

Browse source
This commit is contained in:
B0ney 2025-09-20 19:01:25 +01:00
parent 1cde186def
commit a1122f0754
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
widget/src/scrollable.rs
View file

@ -1230,7 +1230,8 @@ where
if let Some(scroller) = scrollbar.scroller if let Some(scroller) = scrollbar.scroller
&& scroller.bounds.width > 0.0 && scroller.bounds.width > 0.0
&& scroller.bounds.height > 0.0 && scroller.bounds.height > 0.0
&& (style.scroller.color != Color::TRANSPARENT && (style.scroller.background
!= Background::Color(Color::TRANSPARENT)
|| (style.scroller.border.color || (style.scroller.border.color
!= Color::TRANSPARENT != Color::TRANSPARENT
&& style.scroller.border.width > 0.0)) && style.scroller.border.width > 0.0))
@ -1241,7 +1242,7 @@ where
border: style.scroller.border, border: style.scroller.border,
..renderer::Quad::default() ..renderer::Quad::default()
}, },
style.scroller.color, style.scroller.background,
); );
} }
}; };
@ -2294,8 +2295,8 @@ pub struct Rail {
/// The appearance of the scroller of a scrollable. /// The appearance of the scroller of a scrollable.
#[derive(Debug, Clone, Copy, PartialEq)] #[derive(Debug, Clone, Copy, PartialEq)]
pub struct Scroller { pub struct Scroller {
/// The [`Color`] of the scroller. /// The [`Background`] of the scroller.
pub color: Color, pub background: Background,
/// The [`Border`] of the scroller. /// The [`Border`] of the scroller.
pub border: Border, pub border: Border,
} }
@ -2348,7 +2349,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
background: Some(palette.background.weak.color.into()), background: Some(palette.background.weak.color.into()),
border: border::rounded(2), border: border::rounded(2),
scroller: Scroller { scroller: Scroller {
color: palette.background.strongest.color, background: palette.background.strongest.color.into(),
border: border::rounded(2), border: border::rounded(2),
}, },
}; };
@ -2381,7 +2382,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
} => { } => {
let hovered_scrollbar = Rail { let hovered_scrollbar = Rail {
scroller: Scroller { scroller: Scroller {
color: palette.primary.strong.color, background: palette.primary.strong.color.into(),
..scrollbar.scroller ..scrollbar.scroller
}, },
..scrollbar ..scrollbar
@ -2410,7 +2411,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
} => { } => {
let dragged_scrollbar = Rail { let dragged_scrollbar = Rail {
scroller: Scroller { scroller: Scroller {
color: palette.primary.base.color, background: palette.primary.base.color.into(),
..scrollbar.scroller ..scrollbar.scroller
}, },
..scrollbar ..scrollbar