me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement additional helpers for Border and container::Appearance

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-03-07 21:02:17 +01:00
parent b8f05eb8dd
commit 7ece5eea50
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
12 changed files with 71 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

35
core/src/border.rs
View file

@ -1,5 +1,5 @@
//! Draw lines around containers.
use crate::Color;
use crate::{Color, Pixels};
/// A border.
#[derive(Debug, Clone, Copy, PartialEq, Default)]
@ -15,11 +15,38 @@ pub struct Border {
}
impl Border {
/// Creates a new default [`Border`] with the given [`Radius`].
pub fn with_radius(radius: impl Into<Radius>) -> Self {
/// Creates a new default rounded [`Border`] with the given [`Radius`].
///
/// ```
/// # use iced_core::Border;
/// #
/// assert_eq!(Border::rounded(10), Border::default().with_radius(10));
/// ```
pub fn rounded(radius: impl Into<Radius>) -> Self {
Self::default().with_radius(radius)
}
/// Updates the [`Color`] of the [`Border`].
pub fn with_color(self, color: impl Into<Color>) -> Self {
Self {
color: color.into(),
..self
}
}
/// Updates the [`Radius`] of the [`Border`].
pub fn with_radius(self, radius: impl Into<Radius>) -> Self {
Self {
radius: radius.into(),
..Self::default()
..self
}
}
/// Updates the width of the [`Border`].
pub fn with_width(self, width: impl Into<Pixels>) -> Self {
Self {
width: width.into().0,
..self
}
}
}

2
examples/custom_widget/src/main.rs
View file

@ -62,7 +62,7 @@ mod circle {
renderer.fill_quad(
renderer::Quad {
bounds: layout.bounds(),
border: Border::with_radius(self.radius),
border: Border::rounded(self.radius),
..renderer::Quad::default()
},
Color::BLACK,

19
examples/gradient/src/main.rs
View file

@ -4,8 +4,7 @@ use iced::widget::{
};
use iced::{gradient, window};
use iced::{
Alignment, Background, Color, Element, Length, Radians, Sandbox, Settings,
Theme,
Alignment, Color, Element, Length, Radians, Sandbox, Settings, Theme,
};
pub fn main() -> iced::Result {
@ -71,20 +70,12 @@ impl Sandbox for Gradient {
transparent,
} = *self;
let appearance = {
let gradient = gradient::Linear::new(angle)
.add_stop(0.0, start)
.add_stop(1.0, end)
.into();
container::Appearance {
background: Some(Background::Gradient(gradient)),
..Default::default()
}
};
let gradient = gradient::Linear::new(angle)
.add_stop(0.0, start)
.add_stop(1.0, end);
let gradient_box = themer(
appearance,
gradient,
container(horizontal_space())
.width(Length::Fill)
.height(Length::Fill),

2
widget/src/button.rs
View file

@ -543,7 +543,7 @@ fn styled(pair: palette::Pair) -> Appearance {
Appearance {
background: Some(Background::Color(pair.color)),
text_color: pair.text,
border: Border::with_radius(2),
border: Border::rounded(2),
..Appearance::default()
}
}

26
widget/src/container.rs
View file

@ -1,6 +1,7 @@
//! Decorate content and apply alignment.
use crate::core::alignment::{self, Alignment};
use crate::core::event::{self, Event};
use crate::core::gradient::{self, Gradient};
use crate::core::layout;
use crate::core::mouse;
use crate::core::overlay;
@ -510,8 +511,7 @@ pub struct Appearance {
}
impl Appearance {
/// Derives a new [`Appearance`] with a border of the given [`Color`] and
/// `width`.
/// Updates the border of the [`Appearance`] with the given [`Color`] and `width`.
pub fn with_border(
self,
color: impl Into<Color>,
@ -527,7 +527,7 @@ impl Appearance {
}
}
/// Derives a new [`Appearance`] with the given [`Background`].
/// Updates the background of the [`Appearance`].
pub fn with_background(self, background: impl Into<Background>) -> Self {
Self {
background: Some(background.into()),
@ -566,6 +566,24 @@ impl DefaultStyle for Appearance {
}
}
impl DefaultStyle for Color {
fn default_style() -> Style<Self> {
|color, _status| Appearance::default().with_background(*color)
}
}
impl DefaultStyle for Gradient {
fn default_style() -> Style<Self> {
|gradient, _status| Appearance::default().with_background(*gradient)
}
}
impl DefaultStyle for gradient::Linear {
fn default_style() -> Style<Self> {
|gradient, _status| Appearance::default().with_background(*gradient)
}
}
/// A transparent [`Container`].
pub fn transparent<Theme>(_theme: &Theme, _status: Status) -> Appearance {
Appearance::default()
@ -577,7 +595,7 @@ pub fn box_(theme: &Theme, _status: Status) -> Appearance {
Appearance {
background: Some(palette.background.weak.color.into()),
border: Border::with_radius(2),
border: Border::rounded(2),
..Appearance::default()
}
}

2
widget/src/overlay/menu.rs
View file

@ -539,7 +539,7 @@ where
width: bounds.width - appearance.border.width * 2.0,
..bounds
},
border: Border::with_radius(appearance.border.radius),
border: Border::rounded(appearance.border.radius),
..renderer::Quad::default()
},
appearance.selected_background,

4
widget/src/progress_bar.rs
View file

@ -134,7 +134,7 @@ where
width: active_progress_width,
..bounds
},
border: Border::with_radius(appearance.border.radius),
border: Border::rounded(appearance.border.radius),
..renderer::Quad::default()
},
appearance.bar,
@ -230,6 +230,6 @@ fn styled(
Appearance {
background: background.into(),
bar: bar.into(),
border: Border::with_radius(2),
border: Border::rounded(2),
}
}

2
widget/src/radio.rs
View file

@ -328,7 +328,7 @@ where
width: bounds.width - dot_size,
height: bounds.height - dot_size,
},
border: Border::with_radius(dot_size / 2.0),
border: Border::rounded(dot_size / 2.0),
..renderer::Quad::default()
},
appearance.dot_color,

2
widget/src/rule.rs
View file

@ -118,7 +118,7 @@ where
renderer.fill_quad(
renderer::Quad {
bounds,
border: Border::with_radius(appearance.radius),
border: Border::rounded(appearance.radius),
..renderer::Quad::default()
},
appearance.color,

4
widget/src/scrollable.rs
View file

@ -1692,10 +1692,10 @@ pub fn default(theme: &Theme, status: Status) -> Appearance {
let scrollbar = Scrollbar {
background: Some(palette.background.weak.color.into()),
border: Border::with_radius(2),
border: Border::rounded(2),
scroller: Scroller {
color: palette.background.strong.color,
border: Border::with_radius(2),
border: Border::rounded(2),
},
};

4
widget/src/slider.rs
View file

@ -392,7 +392,7 @@ where
width: offset + handle_width / 2.0,
height: style.rail.width,
},
border: Border::with_radius(style.rail.border_radius),
border: Border::rounded(style.rail.border_radius),
..renderer::Quad::default()
},
style.rail.colors.0,
@ -406,7 +406,7 @@ where
width: bounds.width - offset - handle_width / 2.0,
height: style.rail.width,
},
border: Border::with_radius(style.rail.border_radius),
border: Border::rounded(style.rail.border_radius),
..renderer::Quad::default()
},
style.rail.colors.1,

4
widget/src/vertical_slider.rs
View file

@ -397,7 +397,7 @@ where
width: style.rail.width,
height: offset + handle_width / 2.0,
},
border: Border::with_radius(style.rail.border_radius),
border: Border::rounded(style.rail.border_radius),
..renderer::Quad::default()
},
style.rail.colors.1,
@ -411,7 +411,7 @@ where
width: style.rail.width,
height: bounds.height - offset - handle_width / 2.0,
},
border: Border::with_radius(style.rail.border_radius),
border: Border::rounded(style.rail.border_radius),
..renderer::Quad::default()
},
style.rail.colors.0,