summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpml68 <contact@pml68.dev>2025-04-17 00:30:18 +0200
committerpml68 <contact@pml68.dev>2025-04-17 00:30:24 +0200
commite5c682934668c029ac01700465787e49d772425b (patch)
tree7115ed662d6a8f80d94ec016b817ecfd3bafb975
parentfeat(material_theme): implement `qr_code::Catalog` (under feature flag) (diff)
downloadiced-builder-e5c682934668c029ac01700465787e49d772425b.tar.gz
feat(material_theme): implement `combo_box::Catalog`
Diffstat (limited to '')
-rw-r--r--crates/material_theme/src/combo_box.rs5
-rw-r--r--crates/material_theme/src/lib.rs1
-rw-r--r--crates/material_theme/src/menu.rs7
-rw-r--r--crates/material_theme/src/pick_list.rs7
4 files changed, 10 insertions, 10 deletions
diff --git a/crates/material_theme/src/combo_box.rs b/crates/material_theme/src/combo_box.rs
new file mode 100644
index 0000000..3024176
--- /dev/null
+++ b/crates/material_theme/src/combo_box.rs
@@ -0,0 +1,5 @@
+use iced_widget::combo_box::Catalog;
+
+use super::Theme;
+
+impl Catalog for Theme {}
diff --git a/crates/material_theme/src/lib.rs b/crates/material_theme/src/lib.rs
index 06ad838..64e71d3 100644
--- a/crates/material_theme/src/lib.rs
+++ b/crates/material_theme/src/lib.rs
@@ -6,6 +6,7 @@ use serde::Deserialize;
pub mod button;
pub mod checkbox;
+pub mod combo_box;
pub mod container;
#[cfg(feature = "dialog")]
pub mod dialog;
diff --git a/crates/material_theme/src/menu.rs b/crates/material_theme/src/menu.rs
index 5990c00..9f43c72 100644
--- a/crates/material_theme/src/menu.rs
+++ b/crates/material_theme/src/menu.rs
@@ -1,4 +1,4 @@
-use iced_widget::core::{Background, Border, border};
+use iced_widget::core::{Background, border};
use iced_widget::overlay::menu::{Catalog, Style, StyleFn};
use super::Theme;
@@ -20,10 +20,7 @@ pub fn default(theme: &Theme) -> Style {
let colors = theme.colorscheme.surface;
Style {
- border: Border {
- radius: border::bottom(4),
- ..Default::default()
- },
+ border: border::rounded(4),
background: Background::Color(colors.surface_container.base),
text_color: colors.on_surface,
selected_background: Background::Color(mix(
diff --git a/crates/material_theme/src/pick_list.rs b/crates/material_theme/src/pick_list.rs
index 25b09f8..4b34871 100644
--- a/crates/material_theme/src/pick_list.rs
+++ b/crates/material_theme/src/pick_list.rs
@@ -1,4 +1,4 @@
-use iced_widget::core::{Background, Border, border};
+use iced_widget::core::{Background, border};
use iced_widget::pick_list::{Catalog, Status, Style, StyleFn};
use super::Theme;
@@ -38,10 +38,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
},
Status::Opened { .. } => Style {
background: Background::Color(surface.surface_container.highest),
- border: Border {
- radius: border::top(4),
- ..Default::default()
- },
+ border: border::rounded(4),
..active
},
}