summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-01-05 19:29:12 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-01-05 19:29:12 +0100
commit1a0effa961344677daf17b4192243423a154f1bf (patch)
tree954d2431d69004c1037d19c3bb930273347df8d4 /examples
parent2116fbb3c2412030a676c60d65784b9dfa467a0a (diff)
downloadiced-1a0effa961344677daf17b4192243423a154f1bf.tar.gz
iced-1a0effa961344677daf17b4192243423a154f1bf.tar.bz2
iced-1a0effa961344677daf17b4192243423a154f1bf.zip
Add border and shadow styling to `Button`
Diffstat (limited to 'examples')
-rw-r--r--examples/pokedex.rs5
-rw-r--r--examples/stopwatch.rs5
-rw-r--r--examples/todos.rs20
-rw-r--r--examples/tour.rs9
4 files changed, 18 insertions, 21 deletions
diff --git a/examples/pokedex.rs b/examples/pokedex.rs
index 35d38251..2a696ffe 100644
--- a/examples/pokedex.rs
+++ b/examples/pokedex.rs
@@ -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()
}
}
}
diff --git a/examples/stopwatch.rs b/examples/stopwatch.rs
index 99746609..9b69f7ca 100644
--- a/examples/stopwatch.rs
+++ b/examples/stopwatch.rs
@@ -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()
}
}
}
diff --git a/examples/todos.rs b/examples/todos.rs
index ca20183f..1563aad5 100644
--- a/examples/todos.rs
+++ b/examples/todos.rs
@@ -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
}
}
diff --git a/examples/tour.rs b/examples/tour.rs
index d006d397..84e5d516 100644
--- a/examples/tour.rs
+++ b/examples/tour.rs
@@ -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()
}
}