autocommit 2022-04-18 14:14:25 CEST

src/ifs/wl_surface/xdg_surface/xdg_popup.rs

@@ -292,6 +292,10 @@ impl SizedNode for XdgPopup {
         self.xdg.surface.visible.get()
     }
 
+    fn parent(&self) -> Option<Rc<dyn Node>> {
+        self.parent.get().and_then(|x| x.workspace.get().map(|w| w as Rc<dyn Node>))
+    }
+
     fn set_visible(&self, visible: bool) {
         log::info!("set visible = {}", visible);
         self.xdg.set_visible(visible);

src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs

@@ -403,6 +403,10 @@ impl SizedNode for XdgToplevel {
         self.xdg.surface.visible.get()
     }
 
+    fn parent(&self) -> Option<Rc<dyn Node>> {
+        self.parent_node.get()
+    }
+
     fn set_visible(&self, visible: bool) {
         self.xdg.set_visible(visible);
         self.xdg.seat_state.set_visible(self, visible);
@@ -481,10 +485,6 @@ impl ToplevelNode for XdgToplevel {
         &self.toplevel_data
     }
 
-    fn parent(&self) -> Option<Rc<dyn Node>> {
-        self.parent_node.get()
-    }
-
     fn as_node(&self) -> &dyn Node {
         self
     }

src/ifs/wl_surface/xwindow.rs

@@ -366,6 +366,10 @@ impl SizedNode for Xwindow {
         self.surface.visible.get()
     }
 
+    fn parent(&self) -> Option<Rc<dyn Node>> {
+        self.parent_node.get()
+    }
+
     fn set_visible(&self, visible: bool) {
         self.surface.node_set_visible(visible);
         self.seat_state.set_visible(self, visible);
@@ -463,10 +467,6 @@ impl ToplevelNode for Xwindow {
         &self.toplevel_data
     }
 
-    fn parent(&self) -> Option<Rc<dyn Node>> {
-        self.parent_node.get()
-    }
-
     fn as_node(&self) -> &dyn Node {
         self
     }

src/ifs/wl_surface/zwlr_layer_surface_v1.rs

@@ -381,6 +381,10 @@ impl SizedNode for ZwlrLayerSurfaceV1 {
         true
     }
 
+    fn parent(&self) -> Option<Rc<dyn Node>> {
+        Some(self.output.clone())
+    }
+
     fn absolute_position(&self) -> Rect {
         self.pos.get()
     }