Implement theme styling for Scrollable

This commit is contained in:
Héctor Ramón Jiménez 2022-06-07 03:26:48 +02:00
parent ce53d3933c
commit de21a651c0
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
11 changed files with 127 additions and 267 deletions

View file

@ -1,8 +1,8 @@
mod style;
use iced::button;
use iced::scrollable;
use iced::{
button, scrollable, Button, Column, Container, Element, Length,
ProgressBar, Radio, Row, Rule, Sandbox, Scrollable, Settings, Space, Text,
Button, Column, Container, Element, Length, ProgressBar, Radio, Row, Rule,
Sandbox, Scrollable, Settings, Space, Text, Theme,
};
pub fn main() -> iced::Result {
@ -10,13 +10,13 @@ pub fn main() -> iced::Result {
}
struct ScrollableDemo {
theme: style::Theme,
theme: Theme,
variants: Vec<Variant>,
}
#[derive(Debug, Clone)]
enum Message {
ThemeChanged(style::Theme),
ThemeChanged(Theme),
ScrollToTop(usize),
ScrollToBottom(usize),
Scrolled(usize, f32),
@ -66,7 +66,7 @@ impl Sandbox for ScrollableDemo {
theme, variants, ..
} = self;
let choose_theme = style::Theme::ALL.iter().fold(
let choose_theme = [Theme::Light, Theme::Dark].iter().fold(
Column::new().spacing(10).push(Text::new("Choose a theme:")),
|column, option| {
column.push(Radio::new(
@ -92,7 +92,6 @@ impl Sandbox for ScrollableDemo {
.on_scroll(move |offset| {
Message::Scrolled(i, offset)
})
.style(*theme)
.push(Text::new(variant.title))
.push(
Button::new(
@ -157,12 +156,7 @@ impl Sandbox for ScrollableDemo {
.width(Length::Fill)
.height(Length::Fill)
.spacing(10)
.push(
Container::new(scrollable)
.width(Length::Fill)
.height(Length::Fill)
.style(*theme),
)
.push(scrollable)
.push(ProgressBar::new(
0.0..=1.0,
variant.latest_offset,
@ -187,9 +181,12 @@ impl Sandbox for ScrollableDemo {
.height(Length::Fill)
.center_x()
.center_y()
.style(self.theme)
.into()
}
fn theme(&self) -> Theme {
self.theme
}
}
/// A version of a scrollable