Fix egui_taffy

lucasmerlin · Jan 4, 2024 · 3e3868b · 3e3868b
1 parent 29f5a14
commit 3e3868b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/crates/egui_dnd/examples/nested.rs b/crates/egui_dnd/examples/nested.rs
@@ -5,7 +5,6 @@ use egui_dnd::{dnd, DragDropItem, Handle};
 
 pub fn main() {
     let options = eframe::NativeOptions {
-        initial_window_size: Some(egui::vec2(320.0, 240.0)),
         ..Default::default()
     };
     eframe::run_native("DnD", options, Box::new(|_cc| Box::<MyApp>::default())).unwrap();

diff --git a/crates/egui_taffy/src/lib.rs b/crates/egui_taffy/src/lib.rs
@@ -7,7 +7,7 @@ use taffy::prelude::*;
 type Node = NodeId;
 
 struct TaffyState {
-    taffy: Taffy<(usize, egui::Layout)>,
+    taffy: TaffyTree<(usize, egui::Layout)>,
 
     children: Vec<EguiTaffyNode>,
 
@@ -28,7 +28,7 @@ unsafe impl Sync for TaffyState {}
 
 impl TaffyState {
     pub fn new() -> Self {
-        let mut taffy = Taffy::new();
+        let mut taffy = TaffyTree::new();
 
         Self {
             root_node: taffy.new_with_children(Style::default(), &[]).unwrap(),
@@ -271,7 +271,7 @@ impl<'a, 'f> TaffyPass<'a, 'f> {
                             let result_rect = response.response.rect;
 
                             Size {
-                                width: result_rect.width().ceil(),
+                                width: result_rect.width().ceil() + 0.01,
                                 height: result_rect.height(),
                             }
                         },

diff --git a/fancy-example/src/main.rs b/fancy-example/src/main.rs
@@ -1,5 +1,4 @@
 use std::hash::Hash;
-use std::time::Duration;
 
 use eframe::egui::Color32;
 use eframe::emath::lerp;
@@ -138,7 +137,7 @@ fn main() -> eframe::Result<()> {
     std::thread::spawn(move || {
         rt.block_on(async {
             loop {
-                tokio::time::sleep(Duration::from_secs(3600)).await;
+                tokio::time::sleep(std::time::Duration::from_secs(3600)).await;
             }
         })
     });