From ac5fc71ed0752b51172ae95dab9c3c3531dbd6e0 Mon Sep 17 00:00:00 2001 From: aiongg Date: Sat, 14 Nov 2026 04:50:46 +0000 Subject: [PATCH] panels-w1: review fixes (racheck-fix) --- crates/ui-patterns/tests/it/docking/native.rs | 8 ++--- crates/ui-test-kit/src/windows.rs | 31 ++++++++++++++++--- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/crates/ui-patterns/tests/it/docking/native.rs b/crates/ui-patterns/tests/it/docking/native.rs index 363d78269..7d58173f6 100644 --- a/crates/ui-patterns/tests/it/docking/native.rs +++ b/crates/ui-patterns/tests/it/docking/native.rs @@ -4,7 +4,7 @@ use craft_behavior::dock::{Action, Floating, Layout, Node, Permissions, Workspace}; use craft_behavior::placement::Placement; use craft_host::target::{Backend, Caps, Os, ShellInfo}; -use craft_ui::contract::{Bind, BodyCx, Show as _}; +use craft_ui::contract::{Bind, BodyCx, Show as _, ShowContainer as _}; use craft_ui::docking::{DockConfig, DockPanels, PanelSpec}; use craft_ui::patterns::dock::DockArea; use craft_ui::popover::DropVeil; @@ -15,7 +15,7 @@ use craft_ui::testing::pointer::{moved, press, release}; use craft_ui::testing::trial; use craft_ui::testing::windows::FakeSystem; use craft_ui_test_kit::windows::Windows; -use egui::{DroppedFile, Event, HoveredFile, Key, Modifiers, Pos2, Rect, Ui, Vec2, ViewportCommand, ViewportEvent, ViewportId, ViewportInfo}; +use egui::{Event, HoveredFile, Key, Modifiers, Pos2, Rect, Ui, Vec2, ViewportCommand, ViewportEvent, ViewportId, ViewportInfo}; use std::sync::Arc; /// The root window and the palette overlap; the palette is the larger. @@ -372,7 +372,7 @@ fn a_file_dropped_on_a_native_float_reaches_window_files_once() { windows.root_info(info(true, ROOT_AT)); windows.child_info(info(true, PALETTE_AT)); let mut workspace = Workspace::new(Layout::new(None, vec![float()])); - let mut frame = |hovered: Vec, dropped: Vec| { + let mut frame = |hovered: Vec, dropped: Vec| { let mut files = 0; windows.frame_with_files(vec![], vec![], hovered, dropped, |ui| { let config = DockConfig::default(); @@ -389,7 +389,7 @@ fn a_file_dropped_on_a_native_float_reaches_window_files_once() { frame(vec![], vec![]); } let mut total = frame(vec![HoveredFile::default()], vec![]); - total += frame(vec![], vec![DroppedFile { name: "a.png".into(), ..DroppedFile::default() }]); + total += frame(vec![], vec!["a.png".to_owned()]); for _ in 0..2 { total += frame(vec![], vec![]); } diff --git a/crates/ui-test-kit/src/windows.rs b/crates/ui-test-kit/src/windows.rs index 5aca8fe7f..b32532177 100644 --- a/crates/ui-test-kit/src/windows.rs +++ b/crates/ui-test-kit/src/windows.rs @@ -10,7 +10,7 @@ use craft_ui::testing::Frames; use craft_ui::testing::access::{AccessTree, tree_of}; use craft_ui::testing::windows::FakeSystem; use craft_ui::testing::windows::{FullOutput, RawInput}; -use egui::{Context, DroppedFile, Event, HoveredFile, Pos2, Rect, Ui, Vec2, ViewportBuilder, ViewportCommand, ViewportId, ViewportInfo}; +use egui::{Context, Event, HoveredFile, Pos2, Rect, Ui, Vec2, ViewportBuilder, ViewportCommand, ViewportId, ViewportInfo}; use std::cell::{Cell, RefCell}; use std::sync::Arc; @@ -21,7 +21,7 @@ thread_local! { /// The events the next child pass receives (the renderer runs on the trial's thread). static CHILD_EVENTS: RefCell> = const { RefCell::new(Vec::new()) }; /// The files hovering over and dropped on the child's window in the next child pass. - static CHILD_FILES: RefCell<(Vec, Vec)> = const { RefCell::new((Vec::new(), Vec::new())) }; + static CHILD_FILES: RefCell<(Vec, Vec)> = const { RefCell::new((Vec::new(), Vec::new())) }; /// The window facts every child pass reports. static CHILD_INFO: RefCell = RefCell::new(ViewportInfo::default()); /// The window facts the root reports. @@ -107,11 +107,32 @@ fn patch_window(id: ViewportId, builder: ViewportBuilder) { }); } -fn render_child(ctx: &Context, viewport: egui::ImmediateViewport<'_>) { +/// A dropped file that exists only as a path. +#[derive(Debug)] +struct DroppedPath(std::path::PathBuf); + +impl egui::DroppedFile for DroppedPath { + fn path(&self) -> &std::path::Path { + &self.0 + } + + #[cfg(not(target_arch = "wasm32"))] + fn bytes(&self) -> Result, String> { + std::fs::read(&self.0).map_err(|error| error.to_string()) + } + + #[cfg(target_arch = "wasm32")] + fn bytes_async(&self) -> std::pin::Pin, String>> + '_>> { + Box::pin(std::future::ready(Err("there is no file system on the web".to_owned()))) + } +} + +fn render_child(ctx: &Context, viewport: egui::ViewportViewportPlaceholder) { patch_window(viewport.ids.this, viewport.builder); let mut callback = viewport.viewport_ui_cb; let events = CHILD_EVENTS.with(|events| std::mem::take(&mut *events.borrow_mut())); - let (hovered_files, dropped_files) = CHILD_FILES.with(|files| std::mem::take(&mut *files.borrow_mut())); + let (hovered_files, dropped) = CHILD_FILES.with(|files| std::mem::take(&mut *files.borrow_mut())); + let dropped_files = dropped.into_iter().map(|name| Arc::new(DroppedPath(name.into())) as egui::DroppedFileHandle).collect(); let mut info = CHILD_INFO.with(|info| info.borrow().clone()); info.parent = Some(viewport.ids.parent); let mut input = RawInput { @@ -212,7 +233,7 @@ impl Windows { root: Vec, child: Vec, hovered: Vec, - dropped: Vec, + dropped: Vec, ui: impl FnMut(&mut Ui), ) -> Out { CHILD_EVENTS.with(|events| *events.borrow_mut() = child);