From 73b8ae8e5e7f57c608c775272a2980995ab22bb3 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 10 Jul 2020 02:50:47 +0200 Subject: Rename `ComboBox` to `PickList` --- style/src/combo_box.rs | 70 -------------------------------------------------- style/src/lib.rs | 2 +- style/src/pick_list.rs | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 style/src/combo_box.rs create mode 100644 style/src/pick_list.rs (limited to 'style') diff --git a/style/src/combo_box.rs b/style/src/combo_box.rs deleted file mode 100644 index 4d0c4e46..00000000 --- a/style/src/combo_box.rs +++ /dev/null @@ -1,70 +0,0 @@ -use crate::menu; -use iced_core::{Background, Color}; - -/// The appearance of a combo box. -#[derive(Debug, Clone, Copy)] -pub struct Style { - pub text_color: Color, - pub background: Background, - pub border_radius: u16, - pub border_width: u16, - pub border_color: Color, - pub icon_size: f32, -} - -impl std::default::Default for Style { - fn default() -> Self { - Self { - text_color: Color::BLACK, - background: Background::Color([0.87, 0.87, 0.87].into()), - border_radius: 0, - border_width: 1, - border_color: [0.7, 0.7, 0.7].into(), - icon_size: 0.7, - } - } -} - -/// A set of rules that dictate the style of a container. -pub trait StyleSheet { - fn menu(&self) -> menu::Style; - - fn active(&self) -> Style; - - /// Produces the style of a container. - fn hovered(&self) -> Style; -} - -struct Default; - -impl StyleSheet for Default { - fn menu(&self) -> menu::Style { - menu::Style::default() - } - - fn active(&self) -> Style { - Style::default() - } - - fn hovered(&self) -> Style { - Style { - border_color: Color::BLACK, - ..self.active() - } - } -} - -impl std::default::Default for Box { - fn default() -> Self { - Box::new(Default) - } -} - -impl From for Box -where - T: 'static + StyleSheet, -{ - fn from(style: T) -> Self { - Box::new(style) - } -} diff --git a/style/src/lib.rs b/style/src/lib.rs index b19d6600..8e402bb1 100644 --- a/style/src/lib.rs +++ b/style/src/lib.rs @@ -6,9 +6,9 @@ pub use iced_core::{Background, Color}; pub mod button; pub mod checkbox; -pub mod combo_box; pub mod container; pub mod menu; +pub mod pick_list; pub mod progress_bar; pub mod radio; pub mod scrollable; diff --git a/style/src/pick_list.rs b/style/src/pick_list.rs new file mode 100644 index 00000000..fbd431c0 --- /dev/null +++ b/style/src/pick_list.rs @@ -0,0 +1,70 @@ +use crate::menu; +use iced_core::{Background, Color}; + +/// The appearance of a pick list. +#[derive(Debug, Clone, Copy)] +pub struct Style { + pub text_color: Color, + pub background: Background, + pub border_radius: u16, + pub border_width: u16, + pub border_color: Color, + pub icon_size: f32, +} + +impl std::default::Default for Style { + fn default() -> Self { + Self { + text_color: Color::BLACK, + background: Background::Color([0.87, 0.87, 0.87].into()), + border_radius: 0, + border_width: 1, + border_color: [0.7, 0.7, 0.7].into(), + icon_size: 0.7, + } + } +} + +/// A set of rules that dictate the style of a container. +pub trait StyleSheet { + fn menu(&self) -> menu::Style; + + fn active(&self) -> Style; + + /// Produces the style of a container. + fn hovered(&self) -> Style; +} + +struct Default; + +impl StyleSheet for Default { + fn menu(&self) -> menu::Style { + menu::Style::default() + } + + fn active(&self) -> Style { + Style::default() + } + + fn hovered(&self) -> Style { + Style { + border_color: Color::BLACK, + ..self.active() + } + } +} + +impl std::default::Default for Box { + fn default() -> Self { + Box::new(Default) + } +} + +impl From for Box +where + T: 'static + StyleSheet, +{ + fn from(style: T) -> Self { + Box::new(style) + } +} -- cgit