Add border and shadow styling to Button

This commit is contained in:
Héctor Ramón Jiménez 2020-01-05 19:29:12 +01:00
parent 2116fbb3c2
commit 1a0effa961
8 changed files with 58 additions and 32 deletions

View file

@ -225,7 +225,7 @@ fn button<'a>(state: &'a mut button::State, text: &str) -> Button<'a, Message> {
}
mod style {
use iced::{button, Background, Color};
use iced::{button, Background, Color, Vector};
pub enum Button {
Primary,
@ -238,8 +238,9 @@ mod style {
Button::Primary => Color::from_rgb(0.11, 0.42, 0.87),
})),
border_radius: 12,
shadow_offset: 1.0,
shadow_offset: Vector::new(1.0, 1.0),
text_color: Color::WHITE,
..button::Style::default()
}
}
}

View file

@ -180,7 +180,7 @@ mod time {
}
mod style {
use iced::{button, Background, Color};
use iced::{button, Background, Color, Vector};
pub enum Button {
Primary,
@ -197,8 +197,9 @@ mod style {
Button::Destructive => Color::from_rgb(0.8, 0.2, 0.2),
})),
border_radius: 12,
shadow_offset: 1.0,
shadow_offset: Vector::new(1.0, 1.0),
text_color: Color::WHITE,
..button::Style::default()
}
}
}

View file

@ -551,7 +551,7 @@ impl SavedState {
}
mod style {
use iced::{button, Background, Color};
use iced::{button, Background, Color, Vector};
pub enum Button {
Filter { selected: bool },
@ -569,31 +569,25 @@ mod style {
Color::from_rgb(0.2, 0.2, 0.7),
)),
border_radius: 10,
shadow_offset: 0.0,
text_color: Color::WHITE,
..button::Style::default()
}
} else {
button::Style {
background: None,
border_radius: 0,
shadow_offset: 0.0,
text_color: Color::BLACK,
}
button::Style::default()
}
}
Button::Icon => button::Style {
background: None,
border_radius: 0,
shadow_offset: 0.0,
text_color: Color::from_rgb(0.5, 0.5, 0.5),
..button::Style::default()
},
Button::Destructive => button::Style {
background: Some(Background::Color(Color::from_rgb(
0.8, 0.2, 0.2,
))),
border_radius: 5,
shadow_offset: 1.0,
text_color: Color::WHITE,
shadow_offset: Vector::new(1.0, 1.0),
..button::Style::default()
},
}
}
@ -609,7 +603,7 @@ mod style {
}
_ => active.text_color,
},
shadow_offset: active.shadow_offset + 1.0,
shadow_offset: active.shadow_offset + Vector::new(0.0, 1.0),
..active
}
}

View file

@ -27,7 +27,7 @@ impl Sandbox for Tour {
scroll: scrollable::State::new(),
back_button: button::State::new(),
next_button: button::State::new(),
debug: true,
debug: false,
}
}
@ -743,7 +743,7 @@ pub enum Layout {
}
mod style {
use iced::{button, Background, Color};
use iced::{button, Background, Color, Vector};
pub enum Button {
Primary,
@ -758,15 +758,16 @@ mod style {
Button::Secondary => Color::from_rgb(0.5, 0.5, 0.5),
})),
border_radius: 12,
shadow_offset: 1.0,
shadow_offset: Vector::new(1.0, 1.0),
text_color: Color::from_rgb8(0xEE, 0xEE, 0xEE),
..button::Style::default()
}
}
fn hovered(&self) -> button::Style {
button::Style {
text_color: Color::WHITE,
shadow_offset: 2.0,
shadow_offset: Vector::new(1.0, 2.0),
..self.active()
}
}