fmt

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

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use glam::{vec3, Affine3A, Quat, Vec3};
+use glam::{Affine3A, Quat, Vec3, vec3};
 use wlx_common::windowing::OverlayWindowState;
 
 use crate::{

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

@@ -21,10 +21,10 @@ use crate::{
         input::HoverResult,
         task::{OverlayTask, TaskContainer, TaskType},
     },
-    gui::panel::{button::BUTTON_EVENTS, GuiPanel, NewGuiPanelParams, OnCustomAttribFunc},
+    gui::panel::{GuiPanel, NewGuiPanelParams, OnCustomAttribFunc, button::BUTTON_EVENTS},
     overlays::edit::{
         lock::InteractLockHandler,
-        pos::{new_pos_tab_handler, PosTabState},
+        pos::{PosTabState, new_pos_tab_handler},
         sprite_tab::SpriteTabHandler,
         stereo::new_stereo_tab_handler,
         tab::ButtonPaneTabSwitcher,
@@ -32,12 +32,12 @@ use crate::{
     state::AppState,
     subsystem::hid::WheelDelta,
     windowing::{
+        OverlayID, OverlaySelector,
         backend::{
             BackendAttrib, BackendAttribValue, DummyBackend, OverlayBackend, OverlayEventData,
             RenderResources, ShouldRender, StereoMode,
         },
         window::OverlayWindowConfig,
-        OverlayID, OverlaySelector,
     },
 };
 

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

@@ -3,8 +3,8 @@ use wlx_common::{common::LeftRight, windowing::Positioning};
 
 use crate::{
     overlays::edit::{
-        sprite_tab::{SpriteTabHandler, SpriteTabKey},
         EditModeWrapPanel,
+        sprite_tab::{SpriteTabHandler, SpriteTabKey},
     },
     windowing::window,
 };

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

@@ -1,7 +1,7 @@
 use crate::{
     overlays::edit::{
-        sprite_tab::{SpriteTabHandler, SpriteTabKey},
         EditModeWrapPanel,
+        sprite_tab::{SpriteTabHandler, SpriteTabKey},
     },
     windowing::backend::{BackendAttribValue, StereoMode},
 };

wlx-overlay-s/src/overlays/keyboard/mod.rs

@@ -6,13 +6,14 @@ use std::{
 };
 
 use crate::{
+    KEYMAP_CHANGE,
     backend::input::{HoverResult, PointerHit},
     gui::panel::GuiPanel,
     overlays::keyboard::{builder::create_keyboard_panel, layout::AltModifier},
     state::AppState,
     subsystem::hid::{
-        get_keymap_wl, get_keymap_x11, KeyModifier, VirtualKey, WheelDelta, XkbKeymap, ALT, CTRL,
-        META, SHIFT, SUPER,
+        ALT, CTRL, KeyModifier, META, SHIFT, SUPER, VirtualKey, WheelDelta, XkbKeymap,
+        get_keymap_wl, get_keymap_x11,
     },
     windowing::{
         backend::{
@@ -21,12 +22,11 @@ use crate::{
         },
         window::OverlayWindowConfig,
     },
-    KEYMAP_CHANGE,
 };
 use anyhow::Context;
-use glam::{vec3, Affine3A, Quat, Vec3};
+use glam::{Affine3A, Quat, Vec3, vec3};
 use regex::Regex;
-use slotmap::{new_key_type, SlotMap};
+use slotmap::{SlotMap, new_key_type};
 use wgui::{
     drawing,
     event::{InternalStateChangeEvent, MouseButton, MouseButtonIndex},

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

@@ -1,14 +1,14 @@
 use std::{
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
     task::{Context, Poll},
 };
 
 use futures::{Future, FutureExt};
-use glam::{vec3, Affine2, Affine3A, Quat, Vec3};
-use wlx_capture::pipewire::{pipewire_select_screen, PipewireCapture, PipewireSelectScreenResult};
+use glam::{Affine2, Affine3A, Quat, Vec3, vec3};
+use wlx_capture::pipewire::{PipewireCapture, PipewireSelectScreenResult, pipewire_select_screen};
 use wlx_common::windowing::OverlayWindowState;
 
 use crate::{
@@ -19,12 +19,12 @@ use crate::{
     state::{AppSession, AppState},
     subsystem::hid::WheelDelta,
     windowing::{
+        OverlaySelector,
         backend::{
-            ui_transform, BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend,
-            OverlayEventData, RenderResources, ShouldRender,
+            BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, OverlayEventData,
+            RenderResources, ShouldRender, ui_transform,
         },
         window::{OverlayCategory, OverlayWindowConfig},
-        OverlaySelector,
     },
 };
 

wlx-overlay-s/src/overlays/screen/backend.rs

@@ -1,26 +1,26 @@
 use std::{
-    sync::{atomic::AtomicU64, Arc, LazyLock},
+    sync::{Arc, LazyLock, atomic::AtomicU64},
     time::Instant,
 };
 
-use glam::{vec2, Affine2, Vec2};
-use wlx_capture::{frame::Transform, WlxCapture};
+use glam::{Affine2, Vec2, vec2};
+use wlx_capture::{WlxCapture, frame::Transform};
 
 use crate::{
     backend::{
-        input::{HoverResult, PointerHit, PointerMode},
         XrBackend,
+        input::{HoverResult, PointerHit, PointerMode},
     },
     graphics::ExtentExt,
     state::AppState,
-    subsystem::hid::{WheelDelta, MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_RIGHT},
+    subsystem::hid::{MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_RIGHT, WheelDelta},
     windowing::backend::{
         BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, OverlayEventData,
         RenderResources, ShouldRender, StereoMode,
     },
 };
 
-use super::capture::{receive_callback, ScreenPipeline, WlxCaptureIn, WlxCaptureOut};
+use super::capture::{ScreenPipeline, WlxCaptureIn, WlxCaptureOut, receive_callback};
 
 const CURSOR_SIZE: f32 = 16. / 1440.;
 

wlx-overlay-s/src/overlays/screen/capture.rs

@@ -1,31 +1,32 @@
 use std::{f32::consts::PI, sync::Arc};
 
 use glam::{Affine3A, Vec3};
-use smallvec::{smallvec, SmallVec};
+use smallvec::{SmallVec, smallvec};
 use vulkano::{
     buffer::{BufferUsage, Subbuffer},
     command_buffer::CommandBufferUsage,
     device::Queue,
     format::Format,
-    image::{sampler::Filter, view::ImageView, Image},
+    image::{Image, sampler::Filter, view::ImageView},
     pipeline::graphics::color_blend::AttachmentBlend,
 };
 use wgui::gfx::{
+    WGfx,
     cmd::WGfxClearMode,
     pass::WGfxPass,
     pipeline::{WGfxPipeline, WPipelineCreateInfo},
-    WGfx,
 };
 use wlx_capture::{
-    frame::{self as wlx_frame, DrmFormat, FrameFormat, MouseMeta, Transform, WlxFrame},
     WlxCapture,
+    frame::{self as wlx_frame, DrmFormat, FrameFormat, MouseMeta, Transform, WlxFrame},
 };
 use wlx_common::config::GeneralConfig;
 
 use crate::{
     graphics::{
-        dmabuf::{fourcc_to_vk, WGfxDmabuf},
-        upload_quad_vertices, Vert2Uv,
+        Vert2Uv,
+        dmabuf::{WGfxDmabuf, fourcc_to_vk},
+        upload_quad_vertices,
     },
     state::AppState,
     windowing::backend::{FrameMeta, RenderResources, StereoMode},

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

@@ -4,7 +4,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use glam::{vec3, Affine3A, Quat, Vec3, Vec3A};
+use glam::{Affine3A, Quat, Vec3, Vec3A, vec3};
 use idmap::DirectIdMap;
 use wgui::{
     components::button::ComponentButton,
@@ -14,7 +14,7 @@ use wgui::{
     parser::Fetchable,
     renderer_vk::text::custom_glyph::CustomGlyphData,
     taffy,
-    widget::{label::WidgetLabel, sprite::WidgetSprite, EventResult},
+    widget::{EventResult, label::WidgetLabel, sprite::WidgetSprite},
 };
 use wlx_common::{
     common::LeftRight,
@@ -27,16 +27,16 @@ use crate::{
         task::{OverlayTask, TaskType},
     },
     gui::{
-        panel::{button::BUTTON_EVENTS, GuiPanel, NewGuiPanelParams, OnCustomAttribFunc},
+        panel::{GuiPanel, NewGuiPanelParams, OnCustomAttribFunc, button::BUTTON_EVENTS},
         timer::GuiTimer,
     },
     overlays::edit::LongPressButtonState,
     state::AppState,
     windowing::{
+        OverlaySelector, Z_ORDER_WATCH,
         backend::{OverlayEventData, OverlayMeta},
         manager::MAX_OVERLAY_SETS,
         window::{OverlayCategory, OverlayWindowConfig, OverlayWindowData},
-        OverlaySelector, Z_ORDER_WATCH,
     },
 };
 

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

@@ -1,18 +1,18 @@
 use anyhow::Context;
-use glam::{vec3, Affine2, Affine3A, Quat, Vec3};
+use glam::{Affine2, Affine3A, Quat, Vec3, vec3};
 use smallvec::smallvec;
 use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc};
 use vulkano::{
     buffer::{BufferUsage, Subbuffer},
     command_buffer::CommandBufferUsage,
     format::Format,
-    image::{view::ImageView, Image, ImageTiling, SubresourceLayout},
+    image::{Image, ImageTiling, SubresourceLayout, view::ImageView},
 };
 use wayvr_ipc::packet_server::{self, PacketServer, WvrStateChanged};
 use wgui::gfx::{
+    WGfx,
     pass::WGfxPass,
     pipeline::{WGfxPipeline, WPipelineCreateInfo},
-    WGfx,
 };
 use wlx_capture::frame::{DmabufFrame, FourCC, FrameFormat, FramePlane};
 use wlx_common::windowing::OverlayWindowState;
@@ -22,23 +22,22 @@ use crate::{
         input::{self, HoverResult},
         task::{OverlayTask, TaskType},
         wayvr::{
-            self, display,
+            self, WayVR, WayVRAction, WayVRDisplayClickAction, display,
             server_ipc::{gen_args_vec, gen_env_vec},
-            WayVR, WayVRAction, WayVRDisplayClickAction,
         },
     },
     config_wayvr,
-    graphics::{dmabuf::WGfxDmabuf, Vert2Uv},
+    graphics::{Vert2Uv, dmabuf::WGfxDmabuf},
     state::{self, AppState},
     subsystem::{hid::WheelDelta, input::KeyboardFocus},
     windowing::{
+        OverlayID, OverlaySelector, Z_ORDER_DASHBOARD,
         backend::{
-            ui_transform, BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend,
-            OverlayEventData, RenderResources, ShouldRender,
+            BackendAttrib, BackendAttribValue, FrameMeta, OverlayBackend, OverlayEventData,
+            RenderResources, ShouldRender, ui_transform,
         },
         manager::OverlayWindowManager,
         window::{OverlayCategory, OverlayWindowConfig, OverlayWindowData},
-        OverlayID, OverlaySelector, Z_ORDER_DASHBOARD,
     },
 };