includes modified version of table from forked iced_aw to get build w…

…orking again
mimblewimble · Apr 11, 2024 · ee1f032 · ee1f032
1 parent 5b39461
commit ee1f032
Show file tree

Hide file tree

Showing 25 changed files with 117 additions and 1,554 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,8 @@ iced_futures = { version = "0.12", features = ["async-std"] }
 iced_style = {version = "0.12"}
 iced_renderer = { version = "0.12" }
 iced_core = { version = "0.12" }
-iced_aw = { version = "0.8", default-features = false, features = ["card", "modal"]}
+#iced_aw = { path = "../iced_aw", default-features = false, features = ["card", "modal", "table"]}
+iced_aw = { git = "https://github.com/yeastplume/iced_aw.git", branch = "table_widget", default-features = false, features = ["card", "modal", "table"]}
 
 plotters-iced = "0.10.0"
 plotters="0.3"

diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -102,7 +102,8 @@ iced_core = { version = "0.12" }
 iced_style = "0.12"
 iced_graphics = { version = "0.12" }
 iced_renderer = { version = "0.12", features = ["wgpu"] }
-iced_aw = { version = "0.8", default-features = false, features = ["card", "modal"]}
+#iced_aw = { path = "../../../iced_aw", default-features = false, features = ["card", "modal", "table"]}
+iced_aw = { git = "https://github.com/yeastplume/iced_aw.git", branch = "table_widget", default-features = false, features = ["card", "modal", "table"]}
 
 [dev-dependencies]
 tempfile = "3.2.0"

diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
@@ -9,12 +9,10 @@ pub mod fs;
 pub mod logger;
 pub mod network;
 pub mod node;
-pub mod style;
 pub mod theme;
 #[cfg(feature = "wgpu")]
 pub mod utility;
 pub mod wallet;
-pub mod widget;
 
 #[macro_use]
 extern crate lazy_static;

diff --git a/crates/core/src/style/header.rs b/crates/core/src/style/header.rs
diff --git a/crates/core/src/style/mod.rs b/crates/core/src/style/mod.rs