OverlayContainer to use HopSlotMap

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

@@ -1,9 +1,9 @@
 use glam::vec2;
 use wlx_capture::{
-    WlxCapture,
     wayland::{WlxClient, WlxOutput},
     wlr_dmabuf::WlrDmabufCapture,
     wlr_screencopy::WlrScreencopyCapture,
+    WlxCapture,
 };
 
 use crate::{
@@ -13,10 +13,10 @@ use crate::{
 };
 
 use super::{
-    ScreenCreateData,
     backend::ScreenBackend,
-    capture::{MainThreadWlxCapture, new_wlx_capture},
+    capture::{new_wlx_capture, MainThreadWlxCapture},
     pw::{load_pw_token_config, save_pw_token_config},
+    ScreenCreateData,
 };
 
 impl ScreenBackend {
@@ -134,7 +134,6 @@ pub fn create_screens_wayland(wl: &mut WlxClient, app: &mut AppState) -> ScreenC
 
             let meta = ScreenMeta {
                 name: wl.outputs[id].name.clone(),
-                id: state.id,
                 native_handle: *id,
             };
 

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

@@ -2,9 +2,9 @@ use std::sync::Arc;
 
 use glam::vec2;
 use wlx_capture::{
-    WlxCapture,
     frame::Transform,
     xshm::{XshmCapture, XshmScreen},
+    WlxCapture,
 };
 
 use crate::{
@@ -13,9 +13,9 @@ use crate::{
 };
 
 use super::{
-    ScreenCreateData,
     backend::ScreenBackend,
-    capture::{MainThreadWlxCapture, new_wlx_capture},
+    capture::{new_wlx_capture, MainThreadWlxCapture},
+    ScreenCreateData,
 };
 
 #[cfg(feature = "pipewire")]
@@ -112,7 +112,6 @@ pub fn create_screens_x11pw(app: &mut AppState) -> anyhow::Result<ScreenCreateDa
 
             let meta = ScreenMeta {
                 name: m.name.clone(),
-                id: state.id,
                 native_handle: 0,
             };
 
@@ -194,7 +193,6 @@ pub fn create_screens_xshm(app: &mut AppState) -> anyhow::Result<ScreenCreateDat
 
             let meta = ScreenMeta {
                 name: s.name.clone(),
-                id: state.id,
                 native_handle: 0,
             };