From 64b6a0e3c23df9f2bba59716ec0bbdeb2e6c6aff Mon Sep 17 00:00:00 2001 From: aiongg Date: Mon, 26 Oct 2026 18:55:25 +0000 Subject: [PATCH] refactor(lightcraft-ui-egui): move menubar.rs to menus/menubar.rs --- crates/ui-egui/src/lib.rs | 2 +- crates/ui-egui/src/menus.rs | 2 ++ crates/ui-egui/src/{ => menus}/menubar.rs | 0 crates/ui-egui/src/{ => menus}/menubar/tests.rs | 0 4 files changed, 3 insertions(+), 1 deletion(-) rename crates/ui-egui/src/{ => menus}/menubar.rs (100%) rename crates/ui-egui/src/{ => menus}/menubar/tests.rs (100%) diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs index 2900869ec..039d9745c 100644 --- a/crates/ui-egui/src/lib.rs +++ b/crates/ui-egui/src/lib.rs @@ -25,7 +25,6 @@ pub mod icons; pub mod lightroom_import; pub mod links; pub mod menu_level; -pub mod menubar; pub mod menus; mod model_setup; pub mod panels; @@ -66,6 +65,7 @@ pub use dialogs::merge; pub use dialogs::print_view; pub use dialogs::slideshow_export; pub use dialogs::updates_ui; +pub use menus::menubar; pub use state::UiState; const TOAST_SECONDS: f64 = 1.4; diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs index 1ed6dbbf1..bd74923af 100644 --- a/crates/ui-egui/src/menus.rs +++ b/crates/ui-egui/src/menus.rs @@ -8,6 +8,8 @@ use crate::LightcraftApp; use crate::pick::{PickRequest, Picked}; use crate::state::{BeforeAfter, Dialog, RightPanel, ViewMode, Zoom}; +pub mod menubar; + /// (id, label, shortcut, menu path) pub type UiCommand = (&'static str, &'static str, Option<&'static str>, &'static str); diff --git a/crates/ui-egui/src/menubar.rs b/crates/ui-egui/src/menus/menubar.rs similarity index 100% rename from crates/ui-egui/src/menubar.rs rename to crates/ui-egui/src/menus/menubar.rs diff --git a/crates/ui-egui/src/menubar/tests.rs b/crates/ui-egui/src/menus/menubar/tests.rs similarity index 100% rename from crates/ui-egui/src/menubar/tests.rs rename to crates/ui-egui/src/menus/menubar/tests.rs