Introduce an appearance for a scrollable, ability to customize the scrollbar gap.
Update scrollable.rs
This commit is contained in:
parent
891f29eea0
commit
0f920e0435
4 changed files with 71 additions and 6 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
use iced::executor;
|
use iced::executor;
|
||||||
use iced::theme;
|
use iced::theme;
|
||||||
use iced::widget::scrollable::{Properties, Scrollbar, Scroller};
|
use iced::widget::scrollable::{Appearance, Properties, Scrollbar, Scroller};
|
||||||
use iced::widget::{
|
use iced::widget::{
|
||||||
button, column, container, horizontal_space, progress_bar, radio, row,
|
button, column, container, horizontal_space, progress_bar, radio, row,
|
||||||
scrollable, slider, text, vertical_space,
|
scrollable, slider, text, vertical_space,
|
||||||
|
|
@ -355,6 +355,10 @@ struct ScrollbarCustomStyle;
|
||||||
impl scrollable::StyleSheet for ScrollbarCustomStyle {
|
impl scrollable::StyleSheet for ScrollbarCustomStyle {
|
||||||
type Style = Theme;
|
type Style = Theme;
|
||||||
|
|
||||||
|
fn appearance(&self, style: &Self::Style) -> Appearance {
|
||||||
|
style.appearance(&theme::Scrollable::Default)
|
||||||
|
}
|
||||||
|
|
||||||
fn active(&self, style: &Self::Style) -> Scrollbar {
|
fn active(&self, style: &Self::Style) -> Scrollbar {
|
||||||
style.active(&theme::Scrollable::Default)
|
style.active(&theme::Scrollable::Default)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
//! Change the appearance of a scrollable.
|
//! Change the appearance of a scrollable.
|
||||||
use crate::core::{Background, Border, Color};
|
use crate::core::{Background, Border, Color};
|
||||||
|
|
||||||
/// The appearance of a scrollable.
|
/// The appearance of the scrollbar of a scrollable.
|
||||||
#[derive(Debug, Clone, Copy)]
|
#[derive(Debug, Clone, Copy)]
|
||||||
pub struct Scrollbar {
|
pub struct Scrollbar {
|
||||||
/// The [`Background`] of a scrollable.
|
/// The [`Background`] of a scrollbar.
|
||||||
pub background: Option<Background>,
|
pub background: Option<Background>,
|
||||||
/// The [`Border`] of a scrollable.
|
/// The [`Border`] of a scrollbar.
|
||||||
pub border: Border,
|
pub border: Border,
|
||||||
/// The appearance of the [`Scroller`] of a scrollable.
|
/// The appearance of the [`Scroller`] of a scrollbar.
|
||||||
pub scroller: Scroller,
|
pub scroller: Scroller,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -21,11 +21,23 @@ pub struct Scroller {
|
||||||
pub border: Border,
|
pub border: Border,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The appearance of a scrolable.
|
||||||
|
#[derive(Debug, Clone, Copy)]
|
||||||
|
pub struct Appearance {
|
||||||
|
/// The [`Background`] of a scrollable.
|
||||||
|
pub background: Option<Background>,
|
||||||
|
/// The [`Background`] of the gap between a horizontal and vertical scrollbar.
|
||||||
|
pub gap: Option<Background>,
|
||||||
|
}
|
||||||
|
|
||||||
/// A set of rules that dictate the style of a scrollable.
|
/// A set of rules that dictate the style of a scrollable.
|
||||||
pub trait StyleSheet {
|
pub trait StyleSheet {
|
||||||
/// The supported style of the [`StyleSheet`].
|
/// The supported style of the [`StyleSheet`].
|
||||||
type Style: Default;
|
type Style: Default;
|
||||||
|
|
||||||
|
/// Produces the style of the scrollable container.
|
||||||
|
fn appearance(&self, style: &Self::Style) -> Appearance;
|
||||||
|
|
||||||
/// Produces the style of an active scrollbar.
|
/// Produces the style of an active scrollbar.
|
||||||
fn active(&self, style: &Self::Style) -> Scrollbar;
|
fn active(&self, style: &Self::Style) -> Scrollbar;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1188,6 +1188,20 @@ impl Scrollable {
|
||||||
impl scrollable::StyleSheet for Theme {
|
impl scrollable::StyleSheet for Theme {
|
||||||
type Style = Scrollable;
|
type Style = Scrollable;
|
||||||
|
|
||||||
|
fn appearance(&self, style: &Self::Style) -> scrollable::Appearance {
|
||||||
|
match style {
|
||||||
|
Scrollable::Default => {
|
||||||
|
let palette = self.extended_palette();
|
||||||
|
|
||||||
|
scrollable::Appearance {
|
||||||
|
background: None,
|
||||||
|
gap: Some(palette.background.weak.color.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Scrollable::Custom(custom) => custom.appearance(self),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn active(&self, style: &Self::Style) -> scrollable::Scrollbar {
|
fn active(&self, style: &Self::Style) -> scrollable::Scrollbar {
|
||||||
match style {
|
match style {
|
||||||
Scrollable::Default => {
|
Scrollable::Default => {
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,9 @@ use crate::core::{
|
||||||
};
|
};
|
||||||
use crate::runtime::Command;
|
use crate::runtime::Command;
|
||||||
|
|
||||||
pub use crate::style::scrollable::{Scrollbar, Scroller, StyleSheet};
|
pub use crate::style::scrollable::{
|
||||||
|
Appearance, Scrollbar, Scroller, StyleSheet,
|
||||||
|
};
|
||||||
pub use operation::scrollable::{AbsoluteOffset, RelativeOffset};
|
pub use operation::scrollable::{AbsoluteOffset, RelativeOffset};
|
||||||
|
|
||||||
/// A widget that can vertically display an infinite amount of content with a
|
/// A widget that can vertically display an infinite amount of content with a
|
||||||
|
|
@ -878,6 +880,19 @@ pub fn draw<Theme, Renderer>(
|
||||||
_ => mouse::Cursor::Unavailable,
|
_ => mouse::Cursor::Unavailable,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Draw background.
|
||||||
|
let appearence = theme.appearance(style);
|
||||||
|
|
||||||
|
if let Some(background) = appearence.background {
|
||||||
|
renderer.fill_quad(
|
||||||
|
renderer::Quad {
|
||||||
|
bounds,
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
background,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Draw inner content
|
// Draw inner content
|
||||||
if scrollbars.active() {
|
if scrollbars.active() {
|
||||||
renderer.with_layer(bounds, |renderer| {
|
renderer.with_layer(bounds, |renderer| {
|
||||||
|
|
@ -971,6 +986,26 @@ pub fn draw<Theme, Renderer>(
|
||||||
|
|
||||||
draw_scrollbar(renderer, style, &scrollbar);
|
draw_scrollbar(renderer, style, &scrollbar);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//draw filler quad
|
||||||
|
if let (Some(x), Some(y)) = (scrollbars.x, scrollbars.y) {
|
||||||
|
let background = appearence.gap.or(appearence.background);
|
||||||
|
|
||||||
|
if let Some(background) = background {
|
||||||
|
renderer.fill_quad(
|
||||||
|
renderer::Quad {
|
||||||
|
bounds: Rectangle {
|
||||||
|
x: y.bounds.x,
|
||||||
|
y: x.bounds.y,
|
||||||
|
width: y.bounds.width,
|
||||||
|
height: x.bounds.height,
|
||||||
|
},
|
||||||
|
..renderer::Quad::default()
|
||||||
|
},
|
||||||
|
background,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue