merge both crates into egui_extras

Cargo.lock

@@ -813,16 +813,6 @@ dependencies = [
  "winit",
 ]
 
-[[package]]
-name = "egui_datepicker"
-version = "0.16.0"
-dependencies = [
- "chrono",
- "egui",
- "egui_dynamic_grid",
- "serde",
-]
-
 [[package]]
 name = "egui_demo_app"
 version = "0.16.0"
@@ -838,8 +828,7 @@ dependencies = [
  "chrono",
  "criterion",
  "egui",
- "egui_datepicker",
+ "egui_extras",
- "egui_dynamic_grid",
  "ehttp",
  "enum-map",
  "epi",
@@ -850,10 +839,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "egui_dynamic_grid"
+name = "egui_extras"
 version = "0.16.0"
 dependencies = [
+ "chrono",
  "egui",
+ "serde",
 ]
 
 [[package]]

Cargo.toml

@@ -1,10 +1,9 @@
 [workspace]
 resolver = "2"
 members = [
-    "egui_datepicker",
     "egui_demo_app",
     "egui_demo_lib",
-    "egui_dynamic_grid",
+    "egui_extras",
     "egui_glium",
     "egui_glow",
     "egui_web",

egui_datepicker/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "egui_datepicker"
-version = "0.16.0"
-edition = "2018"
-
-[dependencies]
-chrono = "0.4"
-egui = { version = "0.16.0", path = "../egui", default-features = false }
-egui_dynamic_grid = { version = "0.16.0", path = "../egui_dynamic_grid" }
-serde = { version = "1", features = ["derive"] }

egui_demo_lib/Cargo.toml

@@ -21,8 +21,7 @@ all-features = true
 [dependencies]
 egui = { version = "0.16.0", path = "../egui", default-features = false }
 epi = { version = "0.16.0", path = "../epi" }
-egui_dynamic_grid = { version = "0.16.0", path = "../egui_dynamic_grid" }
+egui_extras = { version = "0.16.0", path = "../egui_extras" }
-egui_datepicker = { version = "0.16.0", path = "../egui_datepicker", optional = true }
 
 chrono = { version = "0.4", features = ["js-sys", "wasmbind"], optional = true }
 enum-map = { version = "1", features = ["serde"] }
@@ -48,7 +47,7 @@ criterion = { version = "0.3", default-features = false }
 
 [features]
 default = ["datetime"]
-datetime = ["egui_datepicker", "chrono"]
+datetime = ["egui_extras/datetime", "chrono"]
 
 # Enable additional checks if debug assertions are enabled (debug builds).
 extra_debug_asserts = ["egui/extra_debug_asserts"]
@@ -56,7 +55,12 @@ extra_debug_asserts = ["egui/extra_debug_asserts"]
 extra_asserts = ["egui/extra_asserts"]
 
 http = ["ehttp", "image"]
-persistence = ["egui/persistence", "epi/persistence", "serde"]
+persistence = [
+  "egui/persistence",
+  "epi/persistence",
+  "egui_extras/persistence",
+  "serde",
+]
 serialize = ["egui/serialize", "serde"]
 syntax_highlighting = ["syntect"]
 

egui_demo_lib/src/apps/demo/grid_demo.rs

@@ -1,5 +1,5 @@
 use egui::Color32;
-use egui_dynamic_grid::{GridBuilder, Padding, Size};
+use egui_extras::{GridBuilder, Padding, Size};
 
 /// Shows off a table with dynamic layout
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]

egui_demo_lib/src/apps/demo/table_demo.rs

@@ -1,5 +1,5 @@
 use egui::{Label, RichText};
-use egui_dynamic_grid::{Padding, Size, TableBuilder};
+use egui_extras::{Padding, Size, TableBuilder};
 
 /// Shows off a table with dynamic layout
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]

egui_demo_lib/src/apps/demo/widget_gallery.rs

@@ -207,7 +207,7 @@ impl WidgetGallery {
         #[cfg(feature = "datetime")]
         {
             ui.add(doc_link_label("DatePickerButton", "DatePickerButton"));
-            ui.add(egui_datepicker::DatePickerButton::new(date));
+            ui.add(egui_extras::DatePickerButton::new(date));
             ui.end_row();
         }
 

egui_extras/Cargo.toml

@@ -1,19 +1,30 @@
 [package]
-name = "egui_dynamic_grid"
+name = "egui_extras"
 version = "0.16.0"
 edition = "2018"
-description = "Dynamic grid and table for egui"
+description = "Extra widgets for egui"
 authors = [
     "René Rössler <rene@freshx.de>",
     "Dominik Rössler <dominik@freshx.de>",
 ]
 license = "MIT OR Apache-2.0"
-homepage = "https://github.com/emilk/egui/tree/master/egui_dynamic_grid"
+homepage = "https://github.com/emilk/egui/tree/master/egui_extras"
 readme = "README.md"
-repository = "https://github.com/emilk/egui/tree/master/egui_dynamic_grid"
+repository = "https://github.com/emilk/egui/tree/master/egui_extras"
 categories = ["gui", "graphics"]
 keywords = ["glium", "egui", "gui", "gamedev"]
 include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
 
 [dependencies]
 egui = { version = "0.16.0", path = "../egui", default-features = false }
+
+# feature "datetime":
+chrono = { version = "0.4", optional = true }
+
+# feature "persistence":
+serde = { version = "1", features = ["derive"], optional = true }
+
+[features]
+default = ["datetime"]
+datetime = ["chrono"]
+persistence = ["serde"]

egui_extras/src/datepicker.rs

@@ -1,10 +1,9 @@
-mod datepicker_button;
+mod button;
-mod datepicker_popup;
+mod popup;
 
+pub use button::DatePickerButton;
 use chrono::{Date, Datelike, Duration, NaiveDate, Utc, Weekday};
 
-pub use datepicker_button::DatePickerButton;
-
 #[derive(Debug)]
 struct Week {
     number: u8,

egui_extras/src/datepicker/button.rs

@@ -1,10 +1,9 @@
+use super::popup::DatePickerPopup;
 use chrono::{Date, Utc};
 use egui::{Area, Button, Frame, Key, Order, RichText, Ui, Widget};
-use serde::{Deserialize, Serialize};
 
-use crate::datepicker_popup::DatePickerPopup;
+#[derive(Default, Clone)]
-
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
-#[derive(Default, Clone, Serialize, Deserialize)]
 pub(crate) struct DatePickerButtonState {
     pub picker_visible: bool,
 }

egui_extras/src/datepicker/popup.rs

@@ -1,11 +1,10 @@
+use super::{button::DatePickerButtonState, month_data};
+use crate::{GridBuilder, Padding, Size, TableBuilder};
 use chrono::{Date, Datelike, NaiveDate, Utc, Weekday};
 use egui::{Align, Button, Color32, ComboBox, Direction, Id, Label, Layout, RichText, Ui};
-use egui_dynamic_grid::{GridBuilder, Padding, Size, TableBuilder};
-use serde::{Deserialize, Serialize};
 
-use crate::{datepicker_button::DatePickerButtonState, month_data};
+#[derive(Default, Clone)]
-
+#[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
-#[derive(Default, Clone, Serialize, Deserialize)]
 struct DatePickerPopupState {
     year: i32,
     month: u32,

egui_extras/src/lib.rs

@@ -1,9 +1,11 @@
+mod datepicker;
 mod grid;
 mod layout;
 mod padding;
 mod sizing;
 mod table;
 
+pub use datepicker::DatePickerButton;
 pub use grid::*;
 pub(crate) use layout::Layout;
 pub use padding::Padding;