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

Added accessory_content_color to appreance.

Browse source
This commit is contained in:
Casper Rogild Storm 2022-11-29 12:06:45 +01:00
parent f727fa09cd
commit fe5ab1ee87
No known key found for this signature in database
GPG key ID: 8F52569F9DDB2ECC
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
native/src/widget/pick_list.rs
View file

@ -615,7 +615,7 @@ pub fn draw<T, Renderer>(
content: &content, content: &content,
size, size,
font, font,
color: style.text_color, color: style.accessory_content_color,
bounds: Rectangle { bounds: Rectangle {
x: bounds.x + bounds.width - f32::from(padding.horizontal()), x: bounds.x + bounds.width - f32::from(padding.horizontal()),
y: bounds.center_y() - size / 2.0, y: bounds.center_y() - size / 2.0,

2
style/src/pick_list.rs
View file

@ -8,6 +8,8 @@ pub struct Appearance {
pub text_color: Color, pub text_color: Color,
/// The placeholder [`Color`] of the pick list. /// The placeholder [`Color`] of the pick list.
pub placeholder_color: Color, pub placeholder_color: Color,
/// The accessory content [`Color`] of the pick list.
pub accessory_content_color: Color,
/// The [`Background`] of the pick list. /// The [`Background`] of the pick list.
pub background: Background, pub background: Background,
/// The border radius of the pick list. /// The border radius of the pick list.

2
style/src/theme.rs
View file

@ -534,6 +534,7 @@ impl pick_list::StyleSheet for Theme {
text_color: palette.background.weak.text, text_color: palette.background.weak.text,
background: palette.background.weak.color.into(), background: palette.background.weak.color.into(),
placeholder_color: palette.background.strong.color, placeholder_color: palette.background.strong.color,
accessory_content_color: palette.background.weak.text,
border_radius: 2.0, border_radius: 2.0,
border_width: 1.0, border_width: 1.0,
border_color: palette.background.strong.color, border_color: palette.background.strong.color,
@ -552,6 +553,7 @@ impl pick_list::StyleSheet for Theme {
text_color: palette.background.weak.text, text_color: palette.background.weak.text,
background: palette.background.weak.color.into(), background: palette.background.weak.color.into(),
placeholder_color: palette.background.strong.color, placeholder_color: palette.background.strong.color,
accessory_content_color: palette.background.weak.text,
border_radius: 2.0, border_radius: 2.0,
border_width: 1.0, border_width: 1.0,
border_color: palette.primary.strong.color, border_color: palette.primary.strong.color,