TMP downgrade egui to 0.19.0

Issue in 0.20 because of emilk/egui#2244
fragcolor-xyz · Jan 21, 2023 · 2e167b8 · 2e167b8
1 parent d06b4fb
commit 2e167b8
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 75 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -41,12 +41,12 @@ parity-scale-codec = { version = "2.3.1", default-features = false, optional = t
 chrono = { version = "0.4", optional = true }
 
 chacha20poly1305 = { version = "0.9.0", optional = true }
-egui = { version = "0.20.1", optional = true }
-egui_commonmark = { version = "0.6.0", optional = true }
-egui_dock = { version = "0.3.0", optional = true }
-egui_extras = { version = "0.20.0", optional = true }
+egui = { version = "0.19.0", optional = true }
+egui_commonmark = { version = "0.5.0", optional = true }
+# egui_dock = { version = "0.3.0", optional = true }
+egui_extras = { version = "0.19.0", optional = true }
 egui-gfx = { path = "../src/gfx/egui", optional = true }
-egui_memory_editor = { version = "0.2.2", optional = true }
+# egui_memory_editor = { version = "0.2.2", optional = true }
 syntect = { version = "5.0.0", default-features = false, features = ["default-fancy"], optional = true }
 half = { version = "2.0.0" }
 tract-onnx = { version = "0.17.7", optional = true }
@@ -91,15 +91,15 @@ shards = ["reqwest",
           "chrono",
           "egui",
           "egui_commonmark",
-          "egui_dock",
+          # "egui_dock",
           "egui_extras",
           "egui-gfx",
           "code_editor",
-          "hex_viewer",
+          # "hex_viewer",
           "tract-onnx",
           "enum-map"]
 code_editor = ["syntect", "egui_commonmark/syntax_highlighting"]
-hex_viewer = ["egui_memory_editor"]
+# hex_viewer = ["egui_memory_editor"]
 dllshard = ["dlopen"]
 scripting = []
 

diff --git a/rust/src/shards/gui/containers/mod.rs b/rust/src/shards/gui/containers/mod.rs
@@ -56,16 +56,16 @@ shenum_types! {
   static ref SEQ_OF_ANCHOR_TYPES: Vec<Type>;
 }
 
-struct DockArea {
-  instance: ParamVar,
-  requiring: ExposedTypes,
-  contents: ParamVar,
-  parents: ParamVar,
-  exposing: ExposedTypes,
-  headers: Vec<ParamVar>,
-  shards: Vec<ShardsVar>,
-  tabs: egui_dock::Tree<(ParamVar, ShardsVar)>,
-}
+// struct DockArea {
+//   instance: ParamVar,
+//   requiring: ExposedTypes,
+//   contents: ParamVar,
+//   parents: ParamVar,
+//   exposing: ExposedTypes,
+//   headers: Vec<ParamVar>,
+//   shards: Vec<ShardsVar>,
+//   tabs: egui_dock::Tree<(ParamVar, ShardsVar)>,
+// }
 
 struct Scope {
   parents: ParamVar,
@@ -150,15 +150,15 @@ struct CentralPanel {
 }
 
 mod area;
-mod docking;
+// mod docking;
 mod panels;
 mod scope;
 mod window;
 
 pub fn registerShards() {
   registerShard::<Area>();
   registerEnumType(FRAG_CC, AnchorCC, AnchorEnumInfo.as_ref().into());
-  docking::registerShards();
+  // docking::registerShards();
   registerShard::<Scope>();
   registerShard::<Window>();
   registerEnumType(FRAG_CC, WindowFlagsCC, WindowFlagsEnumInfo.as_ref().into());

diff --git a/rust/src/shards/gui/layouts/mod.rs b/rust/src/shards/gui/layouts/mod.rs
@@ -104,18 +104,18 @@ struct Space {
   amount: ParamVar,
 }
 
-struct Table {
-  parents: ParamVar,
-  requiring: ExposedTypes,
-  rows: ParamVar,
-  columns: ParamVar,
-  striped: ParamVar,
-  resizable: ParamVar,
-  row_index: ParamVar,
-  shards: Vec<ShardsVar>,
-  header_shards: Vec<Option<ShardsVar>>,
-  exposing: ExposedTypes,
-}
+// struct Table {
+//   parents: ParamVar,
+//   requiring: ExposedTypes,
+//   rows: ParamVar,
+//   columns: ParamVar,
+//   striped: ParamVar,
+//   resizable: ParamVar,
+//   row_index: ParamVar,
+//   shards: Vec<ShardsVar>,
+//   header_shards: Vec<Option<ShardsVar>>,
+//   exposing: ExposedTypes,
+// }
 
 struct Vertical {
   parents: ParamVar,
@@ -135,7 +135,7 @@ mod indent;
 mod scroll_area;
 mod separator;
 mod space;
-mod table;
+// mod table;
 mod vertical;
 
 pub fn registerShards() {
@@ -151,6 +151,6 @@ pub fn registerShards() {
   registerShard::<ScrollArea>();
   registerShard::<Separator>();
   registerShard::<Space>();
-  registerShard::<Table>();
+  // registerShard::<Table>();
   registerShard::<Vertical>();
 }
diff --git a/rust/src/shards/gui/widgets/code_editor/syntax_highlighting.rs b/rust/src/shards/gui/widgets/code_editor/syntax_highlighting.rs
@@ -120,7 +120,7 @@ impl Highlighter {
         let underline = if underline {
           egui::Stroke::new(1.0, text_color)
         } else {
-          egui::Stroke::NONE
+          egui::Stroke::none()
         };
         job.sections.push(LayoutSection {
           leading_space: 0.0,

diff --git a/src/gfx/egui/Cargo.toml b/src/gfx/egui/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-egui = { version = "0.20.1" }
-epaint = {version = "0.20.0"}
+egui = { version = "0.19.0" }
+epaint = { version = "0.19.0" }
 lazy_static = "1.4.0"
 
 [build-dependencies]