diff options
Diffstat (limited to '')
| -rw-r--r-- | crates/iced_drop/src/widget/droppable.rs | 11 | ||||
| -rw-r--r-- | crates/material_theme/Cargo.toml | 4 | ||||
| -rw-r--r-- | crates/material_theme/src/image.rs | 15 | ||||
| -rw-r--r-- | crates/material_theme/src/lib.rs | 2 | ||||
| -rw-r--r-- | crates/material_theme/src/text_input.rs | 5 |
5 files changed, 3 insertions, 34 deletions
diff --git a/crates/iced_drop/src/widget/droppable.rs b/crates/iced_drop/src/widget/droppable.rs index 196464a..23c417f 100644 --- a/crates/iced_drop/src/widget/droppable.rs +++ b/crates/iced_drop/src/widget/droppable.rs @@ -416,7 +416,7 @@ where fn overlay<'b>( &'b mut self, tree: &'b mut Tree, - layout: Layout<'_>, + layout: Layout<'b>, renderer: &Renderer, _viewport: &iced::Rectangle, _translation: Vector, @@ -564,13 +564,4 @@ where &Rectangle::with_size(Size::INFINITY), ); } - - fn is_over( - &self, - _layout: Layout<'_>, - _renderer: &Renderer, - _cursor_position: Point, - ) -> bool { - false - } } diff --git a/crates/material_theme/Cargo.toml b/crates/material_theme/Cargo.toml index 0116c1e..e36860b 100644 --- a/crates/material_theme/Cargo.toml +++ b/crates/material_theme/Cargo.toml @@ -5,7 +5,7 @@ authors = ["pml68 <contact@pml68.dev>"] version = "0.14.0-dev" edition = "2024" license = "MIT" -# readme = "README.md" +readme = "README.md" repository = "https://github.com/pml68/iced_builder" categories = ["gui"] keywords = ["gui", "ui", "graphics", "interface", "widgets"] @@ -21,8 +21,6 @@ animate = ["dep:iced_anim"] dialog = ["dep:iced_dialog"] # Provides support for the markdown widget. markdown = ["iced_widget/markdown"] -# Provides support for the image widget. -image = ["iced_widget/image"] # Provides support for the SVG widget. svg = ["iced_widget/svg"] # Provides support for the QR code widget. diff --git a/crates/material_theme/src/image.rs b/crates/material_theme/src/image.rs deleted file mode 100644 index 4251b39..0000000 --- a/crates/material_theme/src/image.rs +++ /dev/null @@ -1,15 +0,0 @@ -use iced_widget::image::{Catalog, Style, StyleFn}; - -use super::Theme; - -impl Catalog for Theme { - type Class<'a> = StyleFn<'a, Self>; - - fn default<'a>() -> Self::Class<'a> { - Box::new(|_theme| Style::default()) - } - - fn style(&self, class: &Self::Class<'_>) -> Style { - class(self) - } -} diff --git a/crates/material_theme/src/lib.rs b/crates/material_theme/src/lib.rs index b04edf0..e59e1e9 100644 --- a/crates/material_theme/src/lib.rs +++ b/crates/material_theme/src/lib.rs @@ -11,8 +11,6 @@ pub mod combo_box; pub mod container; #[cfg(feature = "dialog")] pub mod dialog; -#[cfg(feature = "image")] -pub mod image; #[cfg(feature = "markdown")] pub mod markdown; pub mod menu; diff --git a/crates/material_theme/src/text_input.rs b/crates/material_theme/src/text_input.rs index ed5e02a..4db220b 100644 --- a/crates/material_theme/src/text_input.rs +++ b/crates/material_theme/src/text_input.rs @@ -36,10 +36,7 @@ pub fn default(theme: &Theme, status: Status) -> Style { match status { Status::Active => active, Status::Hovered => Style { - border: Border { - color: surface.on_surface, - ..active.border - }, + border: active.border.color(surface.on_surface), ..active }, Status::Disabled => Style { |
