implement edit mode toggle

wlx-overlay-s/src/backend/openvr/mod.rs

@@ -260,6 +260,20 @@ pub fn openvr_run(
                 TaskType::ToggleSet(set) => {
                     overlays.switch_or_toggle_set(&mut app, set);
                 }
+                TaskType::ToggleEditMode => {
+                    if !overlays.get_edit_mode() {
+                        Toast::new(
+                            ToastTopic::System,
+                            "Edit mode enabled".into(),
+                            "Hover overlays to see their options".into(),
+                        )
+                        .with_timeout(5.)
+                        .with_sound(true)
+                        .submit(&mut app);
+                    }
+
+                    overlays.set_edit_mode(!overlays.get_edit_mode());
+                }
                 #[cfg(feature = "wayvr")]
                 TaskType::WayVR(action) => {
                     wayvr_action(&mut app, &mut overlays, &action);

wlx-overlay-s/src/backend/openxr/mod.rs

@@ -544,6 +544,20 @@ pub fn openxr_run(
                 TaskType::ToggleSet(set) => {
                     overlays.switch_or_toggle_set(&mut app, set);
                 }
+                TaskType::ToggleEditMode => {
+                    if !overlays.get_edit_mode() {
+                        Toast::new(
+                            ToastTopic::System,
+                            "Edit mode enabled".into(),
+                            "Hover overlays to see their options".into(),
+                        )
+                        .with_timeout(5.)
+                        .with_sound(true)
+                        .submit(&mut app);
+                    }
+
+                    overlays.set_edit_mode(!overlays.get_edit_mode());
+                }
                 #[cfg(feature = "wayvr")]
                 TaskType::WayVR(action) => {
                     wayvr_action(&mut app, &mut overlays, &action);

wlx-overlay-s/src/backend/task.rs

@@ -58,6 +58,7 @@ pub enum TaskType {
     CreateOverlay(OverlaySelector, Box<CreateOverlayTask>),
     DropOverlay(OverlaySelector),
     ToggleSet(usize),
+    ToggleEditMode,
     System(SystemTask),
     #[cfg(feature = "wayvr")]
     WayVR(WayVRAction),

wlx-overlay-s/src/gui/panel/button.rs

@@ -61,7 +61,10 @@ pub(super) fn setup_custom_button<S: 'static>(
             "::WatchSwapHand" => todo!(),
             // TODO
             #[allow(clippy::match_same_arms)]
-            "::EditToggle" => return,
+            "::EditToggle" => Box::new(move |_common, _data, app, _| {
+                app.tasks.enqueue(TaskType::ToggleEditMode);
+                Ok(EventResult::Consumed)
+            }),
             // TODO
             #[allow(clippy::match_same_arms)]
             "::OscSend" => return,

wlx-overlay-s/src/overlays/edit.rs

@@ -20,11 +20,12 @@ use crate::{
 type EditModeWrapPanel = GuiPanel<Arc<str>>;
 
 #[derive(Default)]
-pub struct EditModeManager {
+pub struct EditWrapperManager {
+    edit_mode: bool,
     panel_pool: Vec<EditModeWrapPanel>,
 }
 
-impl EditModeManager {
+impl EditWrapperManager {
     pub fn wrap_edit_mode(
         &mut self,
         owc: &mut OverlayWindowConfig,

wlx-overlay-s/src/windowing/manager.rs

@@ -5,8 +5,11 @@ use slotmap::{HopSlotMap, Key, SecondaryMap};
 
 use crate::{
     overlays::{
-        anchor::create_anchor, edit::EditModeManager, keyboard::builder::create_keyboard,
+        anchor::create_anchor,
-        screen::create_screens, watch::create_watch,
+        edit::EditWrapperManager,
+        keyboard::builder::create_keyboard,
+        screen::create_screens,
+        watch::{create_watch, WATCH_NAME},
     },
     state::AppState,
     windowing::{
@@ -18,7 +21,7 @@ use crate::{
 };
 
 pub struct OverlayWindowManager<T> {
-    wrappers: EditModeManager,
+    wrappers: EditWrapperManager,
     overlays: HopSlotMap<OverlayID, OverlayWindowData<T>>,
     sets: Vec<OverlayWindowSet>,
     /// The set that is currently visible.
@@ -28,6 +31,7 @@ pub struct OverlayWindowManager<T> {
     restore_set: usize,
     anchor_local: Affine3A,
     watch_id: OverlayID,
+    edit_mode: bool,
 }
 
 impl<T> OverlayWindowManager<T>
@@ -38,13 +42,14 @@ where
         let mut maybe_keymap = None;
 
         let mut me = Self {
-            wrappers: EditModeManager::default(),
+            wrappers: EditWrapperManager::default(),
             overlays: HopSlotMap::with_key(),
             current_set: Some(0),
             restore_set: 0,
             sets: vec![OverlayWindowSet::default()],
             anchor_local: Affine3A::from_translation(Vec3::NEG_Z),
             watch_id: OverlayID::null(), // set down below
+            edit_mode: false,
         };
 
         if headless {
@@ -170,11 +175,32 @@ impl<T> OverlayWindowManager<T> {
         self.restore_set = (app.session.config.last_set as usize).min(self.sets.len() - 1);
     }
 
+    pub fn get_edit_mode(&self) -> bool {
+        self.edit_mode
+    }
+    pub fn set_edit_mode(&mut self, enabled: bool) {
+        self.edit_mode = enabled;
+        if enabled {
+            return;
+        }
+        for o in self.overlays.values_mut() {
+            self.wrappers.unwrap_edit_mode(&mut o.config);
+        }
+    }
+
     pub fn edit_overlay(&mut self, id: OverlayID, enabled: bool, app: &mut AppState) {
+        if !self.edit_mode {
+            return;
+        }
+
         let Some(overlay) = self.overlays.get_mut(id) else {
             return;
         };
 
+        if &*overlay.config.name == WATCH_NAME {
+            return; // FIXME: not a proper solution
+        }
+
         if enabled {
             self.wrappers
                 .wrap_edit_mode(&mut overlay.config, app)