summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2022-08-04 03:58:00 +0200
committerLibravatar GitHub <noreply@github.com>2022-08-04 03:58:00 +0200
commit7021b940c29a037374288c0d771c0f6e8f4ae231 (patch)
tree63942d05122b24f29519a1ce2bade68308640a62
parentc44267b85f7aaa2997e3caf1323b837d95818c22 (diff)
parent0c13af179ff72ee27bea48e394a16cfc14257163 (diff)
downloadiced-7021b940c29a037374288c0d771c0f6e8f4ae231.tar.gz
iced-7021b940c29a037374288c0d771c0f6e8f4ae231.tar.bz2
iced-7021b940c29a037374288c0d771c0f6e8f4ae231.zip
Merge pull request #1396 from nicksenger/style/menu-border-radius
Allow specification of `border_radius` for `pick_list::Menu`
Diffstat (limited to '')
-rw-r--r--native/src/overlay/menu.rs4
-rw-r--r--style/src/menu.rs1
-rw-r--r--style/src/theme.rs1
3 files changed, 4 insertions, 2 deletions
diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index fc3f52b2..7b8d4d9e 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -273,7 +273,7 @@ where
},
border_color: appearance.border_color,
border_width: appearance.border_width,
- border_radius: 0.0,
+ border_radius: appearance.border_radius,
},
appearance.background,
);
@@ -461,7 +461,7 @@ where
bounds,
border_color: Color::TRANSPARENT,
border_width: 0.0,
- border_radius: 0.0,
+ border_radius: appearance.border_radius,
},
appearance.selected_background,
);
diff --git a/style/src/menu.rs b/style/src/menu.rs
index b1dd5ea0..6ef3e2a2 100644
--- a/style/src/menu.rs
+++ b/style/src/menu.rs
@@ -6,6 +6,7 @@ pub struct Appearance {
pub text_color: Color,
pub background: Background,
pub border_width: f32,
+ pub border_radius: f32,
pub border_color: Color,
pub selected_text_color: Color,
pub selected_background: Background,
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 5697b240..9e9abfa0 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -366,6 +366,7 @@ impl menu::StyleSheet for Theme {
text_color: palette.background.weak.text,
background: palette.background.weak.color.into(),
border_width: 1.0,
+ border_radius: 0.0,
border_color: palette.background.strong.color,
selected_text_color: palette.primary.strong.text,
selected_background: palette.primary.strong.color.into(),