From d3cfadd9e2d826458d5abb68a48241084c3becb1 Mon Sep 17 00:00:00 2001 From: aiongg Date: Mon, 26 Oct 2026 20:36:36 +0000 Subject: [PATCH] refactor(ui-egui): move motion.rs into platform/ --- crates/ui-egui/src/lib.rs | 2 +- crates/ui-egui/src/platform.rs | 1 + crates/ui-egui/src/{ => platform}/motion.rs | 0 crates/ui-egui/src/{ => platform}/motion/tests.rs | 6 ++---- 4 files changed, 4 insertions(+), 5 deletions(-) rename crates/ui-egui/src/{ => platform}/motion.rs (100%) rename crates/ui-egui/src/{ => platform}/motion/tests.rs (99%) diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 3d8898b576..6ede6f5ef3 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -48,7 +48,6 @@ pub mod folders_ui; mod home; pub mod last_session; pub mod last_view; -pub mod motion; mod panels; #[cfg(not(target_arch = "wasm32"))] mod pickers; @@ -125,6 +124,7 @@ use platform::drag_pointer; pub use platform::file_watch; #[cfg(target_os = "macos")] use platform::macos_association; +pub use platform::motion; #[cfg(test)] use state::CopyPage; #[cfg(not(target_arch = "wasm32"))] diff --git a/crates/ui-egui/src/platform.rs b/crates/ui-egui/src/platform.rs index 22b8f4680d..6e0c29548e 100644 --- a/crates/ui-egui/src/platform.rs +++ b/crates/ui-egui/src/platform.rs @@ -3,3 +3,4 @@ pub(super) mod drag_pointer; pub mod file_watch; #[cfg(target_os = "macos")] pub(super) mod macos_association; +pub mod motion; diff --git a/crates/ui-egui/src/motion.rs b/crates/ui-egui/src/platform/motion.rs similarity index 100% rename from crates/ui-egui/src/motion.rs rename to crates/ui-egui/src/platform/motion.rs diff --git a/crates/ui-egui/src/motion/tests.rs b/crates/ui-egui/src/platform/motion/tests.rs similarity index 99% rename from crates/ui-egui/src/motion/tests.rs rename to crates/ui-egui/src/platform/motion/tests.rs index c9c291252c..e2d44f2438 100644 --- a/crates/ui-egui/src/motion/tests.rs +++ b/crates/ui-egui/src/platform/motion/tests.rs @@ -46,8 +46,7 @@ fn a_touch_gesture_keeps_its_modifiers_and_ends_clean() { let options = egui::InputOptions::default(); let point = |dy: f32, phase, modifiers| wheel(MouseWheelUnit::Point, vec2(0.0, dy), phase, modifiers); // ⌘ held as the fingers land, let go before the momentum: still zooming. - let began = - reader.read(&[point(0.0, TouchPhase::Start, Modifiers::COMMAND), point(20.0, TouchPhase::Move, Modifiers::COMMAND)], 600.0, &options); + let began = reader.read(&[point(0.0, TouchPhase::Start, Modifiers::COMMAND), point(20.0, TouchPhase::Move, Modifiers::COMMAND)], 600.0, &options); assert!(began.zoom > 1.0 && began.scroll == Vec2::ZERO, "{began:?}"); let momentum = reader.read(&[point(20.0, TouchPhase::Move, Modifiers::NONE)], 600.0, &options); assert!(momentum.zoom > 1.0 && momentum.scroll == Vec2::ZERO, "{momentum:?}"); @@ -204,8 +203,7 @@ fn the_preference_overrides_the_system_for_every_animation() { let ctx = egui::Context::default(); let mut motion = Motion::default(); let mut time = 0.0; - for (effects, times) in [(Off, (0.0, ScrollAnimation::none())), (System, egui_times), (Off, (0.0, ScrollAnimation::none())), (On, egui_times)] - { + for (effects, times) in [(Off, (0.0, ScrollAnimation::none())), (System, egui_times), (Off, (0.0, ScrollAnimation::none())), (On, egui_times)] { pass(&ctx, &mut time, Vec::new(), |ctx| motion.begin_pass(ctx, effects)); let style = ctx.global_style(); assert_eq!((style.animation_time, style.scroll_animation), times, "{effects:?}");