diff --git a/uidev/src/main.rs b/uidev/src/main.rs index 5ee6cc8..96ed93d 100644 --- a/uidev/src/main.rs +++ b/uidev/src/main.rs @@ -1,4 +1,3 @@ -use anyhow::Context; use glam::{vec2, Vec2}; use std::sync::Arc; use testbed::{testbed_any::TestbedAny, Testbed}; diff --git a/wlx-overlay-s/src/backend/input.rs b/wlx-overlay-s/src/backend/input.rs index 91cc203..5c3a0e9 100644 --- a/wlx-overlay-s/src/backend/input.rs +++ b/wlx-overlay-s/src/backend/input.rs @@ -235,7 +235,7 @@ impl Pointer { } } - pub fn hand(&self) -> Option { + pub const fn hand(&self) -> Option { match self.idx { 0 => Some(LeftRight::Left), 1 => Some(LeftRight::Right), @@ -679,12 +679,12 @@ where // single grab push/pull grab_data.offset.translation.z -= pointer.now.scroll_y * 0.05; } - if !pointer.now.click_modifier_right { + if pointer.now.click_modifier_right { + app.anchor = pointer.pose * grab_data.offset; + } else { app.anchor.translation = pointer.pose.transform_point3a(grab_data.offset.translation); realign(&mut app.anchor, &app.input_state.hmd); - } else { - app.anchor = pointer.pose * grab_data.offset; } } else { // single grab resize @@ -695,12 +695,12 @@ where // single grab push/pull grab_data.offset.translation.z -= pointer.now.scroll_y * 0.05; } - if !pointer.now.click_modifier_right { + if pointer.now.click_modifier_right { + overlay_state.transform = pointer.pose * grab_data.offset; + } else { overlay_state.transform.translation = pointer.pose.transform_point3a(grab_data.offset.translation); realign(&mut overlay_state.transform, &app.input_state.hmd); - } else { - overlay_state.transform = pointer.pose * grab_data.offset; } overlay.config.pause_movement = true; overlay.config.dirty = true; diff --git a/wlx-overlay-s/src/overlays/edit/pos.rs b/wlx-overlay-s/src/overlays/edit/pos.rs index 93bc6d0..82a198e 100644 --- a/wlx-overlay-s/src/overlays/edit/pos.rs +++ b/wlx-overlay-s/src/overlays/edit/pos.rs @@ -61,9 +61,9 @@ impl PositioningHandler { buttons.insert( *name, Rc::new(PosButtonState { - component, name, sprite, + component, positioning, has_interpolation, }), diff --git a/wlx-overlay-s/src/overlays/screen/backend.rs b/wlx-overlay-s/src/overlays/screen/backend.rs index aaa7c22..229f533 100644 --- a/wlx-overlay-s/src/overlays/screen/backend.rs +++ b/wlx-overlay-s/src/overlays/screen/backend.rs @@ -235,7 +235,7 @@ impl OverlayBackend for ScreenBackend { MOUSE_RIGHT => MOUSE_LEFT, other => other, }; - }; + } if pressed { set_next_move(u64::from(app.session.config.click_freeze_time_ms)); diff --git a/wlx-overlay-s/src/overlays/watch.rs b/wlx-overlay-s/src/overlays/watch.rs index c3ef2bb..6df3c9d 100644 --- a/wlx-overlay-s/src/overlays/watch.rs +++ b/wlx-overlay-s/src/overlays/watch.rs @@ -44,8 +44,8 @@ pub const WATCH_NAME: &str = "watch"; const MAX_TOOLBOX_BUTTONS: usize = 16; const MAX_DEVICES: usize = 9; -pub(crate) const WATCH_POS: Vec3 = vec3(-0.03, -0.01, 0.125); -pub(crate) const WATCH_ROT: Quat = Quat::from_xyzw(-0.707_106_6, 0.000_796_361_8, 0.707_106_6, 0.0); +pub const WATCH_POS: Vec3 = vec3(-0.03, -0.01, 0.125); +pub const WATCH_ROT: Quat = Quat::from_xyzw(-0.707_106_6, 0.000_796_361_8, 0.707_106_6, 0.0); #[derive(Default)] struct WatchState { diff --git a/wlx-overlay-s/src/state.rs b/wlx-overlay-s/src/state.rs index 5e691f6..d7dda2c 100644 --- a/wlx-overlay-s/src/state.rs +++ b/wlx-overlay-s/src/state.rs @@ -104,7 +104,7 @@ impl AppState { Box::new(gui::asset::GuiAsset {}), wgui::globals::Defaults::default(), &WguiFontConfig::default(), - get_config_file_path(&*theme), + get_config_file_path(&theme), )?, #[cfg(feature = "osc")] diff --git a/wlx-overlay-s/src/windowing/manager.rs b/wlx-overlay-s/src/windowing/manager.rs index 11a5224..a888888 100644 --- a/wlx-overlay-s/src/windowing/manager.rs +++ b/wlx-overlay-s/src/windowing/manager.rs @@ -216,12 +216,10 @@ where OverlayTask::Drop(sel) => { if let Some(o) = self.mut_by_selector(&sel) && o.birthframe < FRAME_COUNTER.load(Ordering::Relaxed) - { - if let Some(o) = self.remove_by_selector(&sel, app) { + && let Some(o) = self.remove_by_selector(&sel, app) { log::debug!("Dropping overlay {}", o.config.name); self.dropped_overlays.push_back(o); } - } } } Ok(()) @@ -258,7 +256,7 @@ impl OverlayWindowManager { .collect(); // overlays that we haven't seen since startup (e.g. wayvr apps) - for (k, o) in set.inactive_overlays.iter() { + for (k, o) in &set.inactive_overlays { if !overlays.contains_key(k) { overlays.insert(k.clone(), o.clone()); } @@ -311,8 +309,8 @@ impl OverlayWindowManager { let mut overlays = SecondaryMap::new(); let mut inactive_overlays = AStrMap::new(); - for (name, o) in s.overlays.iter() { - if let Some(id) = self.lookup(&*name) { + for (name, o) in &s.overlays { + if let Some(id) = self.lookup(name) { log::debug!("set {i}: loaded state for {name}"); overlays.insert(id, o.clone()); } else { @@ -477,7 +475,7 @@ impl OverlayWindowManager { if !global { for (i, set) in self.sets.iter_mut().enumerate() { - let Some(mut state) = set.inactive_overlays.arc_rm(&*name) else { + let Some(mut state) = set.inactive_overlays.arc_rm(&name) else { continue; }; if self.current_set == Some(i) { @@ -495,7 +493,7 @@ impl OverlayWindowManager { } if !shown && show_on_spawn { - log::debug!("activating {} due to show_on_spawn", name); + log::debug!("activating {name} due to show_on_spawn"); self.overlays[oid].config.activate(app); } if !internal && let Err(e) = self.overlays_changed(app) { diff --git a/wlx-overlay-s/src/windowing/window.rs b/wlx-overlay-s/src/windowing/window.rs index ef057d3..1c5b003 100644 --- a/wlx-overlay-s/src/windowing/window.rs +++ b/wlx-overlay-s/src/windowing/window.rs @@ -104,7 +104,7 @@ impl OverlayWindowConfig { } } - pub fn is_active(&self) -> bool { + pub const fn is_active(&self) -> bool { self.active_state.is_some() }