Merge pull request #82 from genusistimelord/main

Removed Colors feature as it is required for most widgets now.
iced-rs · Jan 30, 2023 · 385567b · 385567b
2 parents 120087c + 287ae97
commit 385567b
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 22 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,6 @@ categories = ["gui"]
 [features]
 badge = []
 card = []
-colors = []
 date_picker = ["chrono", "lazy_static", "icon_text"]
 color_picker = ["icon_text", "iced_graphics/canvas"]
 floating_element = []
@@ -34,17 +33,16 @@ split = []
 default = [
     "badge",
     "card",
-    "colors",
     "number_input",
-    #"date_picker",
-    #"color_picker",
+    "date_picker",
+    "color_picker",
     "floating_element",
     "icon_text",
     "grid",
     "modal",
     "tab_bar",
     "tabs",
-    #"time_picker",
+    "time_picker",
     "wrap",
     "selection_list",
     "split",

diff --git a/README.md b/README.md
@@ -37,7 +37,6 @@ iced_aw = { version = "0.2", default-features = false, features = [...] }
 Please take a look into our examples on how to use badges.
 
 Enable this widget with the feature `badge`.
-To enable predefined styles, enable the feature `colors`.
 
 ### Card
 
@@ -51,7 +50,6 @@ To enable predefined styles, enable the feature `colors`.
 Please take a look into our examples on how to use cards.
 
 Enable this widget with the feature `card`.
-To enable predefined styles, enable the feature `colors`.
 
 ### Color Picker
 
@@ -88,7 +86,6 @@ Enable this widget with the feature `date_picker`.
 Please take a look into our examples on how to use floating elements.
 
 Enable this widget with the feature `floating_element`.
-To enable predefined styles for buttons, enable the feature `colors`.
 
 ### Modal
 
@@ -104,7 +101,6 @@ Modals are useful for showing some content as an overlay on top. In combination
 Please take a look into our examples on how to use modals.
 
 Enable this widget with the feature `modal`.
-To enable predefined styles, enable the feature `colors`.
 
 ### NumberInput
 
@@ -172,8 +168,6 @@ Quickstart features are pretty handy to start and experiment having everything l
 
 This crate adds a predefined color palette based on the [CSS color palette](https://www.w3schools.com/cssref/css_colors.asp).
 
-Enable colors with the feature `colors`.
-
 ### Bootstrap icons
 
 Thanks to [Bootstrap](https://icons.getbootstrap.com), iced_aw now contains ~1,200 icons to be used in an Iced GUI.

diff --git a/examples/badge/Cargo.toml b/examples/badge/Cargo.toml
@@ -9,6 +9,5 @@ edition = "2021"
 [dependencies]
 iced_aw = { workspace = true, features = [
     "badge",
-    "colors",
 ] }
 iced.workspace = true
diff --git a/examples/card/Cargo.toml b/examples/card/Cargo.toml
@@ -9,6 +9,5 @@ edition = "2021"
 [dependencies]
 iced_aw = { workspace = true, features = [
     "card",
-    "colors",
 ] }
 iced.workspace = true
diff --git a/examples/color_picker/Cargo.toml b/examples/color_picker/Cargo.toml
@@ -9,6 +9,5 @@ edition = "2021"
 [dependencies]
 iced_aw = { workspace = true, features = [
     "color_picker",
-    "colors",
 ] }
 iced.workspace = true
diff --git a/examples/date_picker/Cargo.toml b/examples/date_picker/Cargo.toml
@@ -8,6 +8,5 @@ edition = "2021"
 [dependencies]
 iced_aw = { workspace = true, features = [
     "date_picker",
-    "colors",
 ] }
 iced.workspace = true
diff --git a/examples/floating_element/Cargo.toml b/examples/floating_element/Cargo.toml
@@ -9,7 +9,6 @@ edition = "2021"
 [dependencies]
 iced_aw = { workspace = true, features = [
     "floating_element",
-    "colors",
     "icons",
 ] }
 iced.workspace = true
diff --git a/examples/modal/Cargo.toml b/examples/modal/Cargo.toml
@@ -9,7 +9,6 @@ edition = "2021"
 [dependencies]
 iced_aw = { workspace = true, features = [
     "card",
-    "colors",
     "modal",
 ] }
 iced.workspace = true
diff --git a/examples/time_picker/Cargo.toml b/examples/time_picker/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 
 [dependencies]
 iced_aw = { workspace = true, features = [
-    "colors",
     "time_picker",
 ] }
 iced.workspace = true
diff --git a/src/style/colors.rs b/src/style/colors.rs
@@ -1,6 +1,5 @@
 //! Predefined color palette based on the CSS color palette
 //!
-//! *This API requires the following crate features to be activated: colors*
 //!
 //! Thanks to:
 //! * [W3 Schools](https://www.w3schools.com/cssref/css_colors.asp)

diff --git a/src/style/mod.rs b/src/style/mod.rs
@@ -1,9 +1,7 @@
 //! The appearance of the widgets
 
-pub mod style_state;
-
-#[cfg(feature = "colors")]
 pub mod colors;
+pub mod style_state;
 
 #[cfg(feature = "badge")]
 pub mod badge;