kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

tree: add Node::node_layer

Browse source
This commit is contained in:
Julian Orth 2025-07-19 21:57:47 +02:00
parent a5e8b39e4f
commit dbc954dded
19 changed files with 294 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ifs/wl_surface/xdg_surface/xdg_popup.rs
View file

@ -19,8 +19,8 @@ use {
rect::Rect,
renderer::Renderer,
tree::{
FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeLocation, NodeVisitor,
OutputNode, StackedNode,
FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId, NodeLayerLink, NodeLocation,
NodeVisitor, OutputNode, StackedNode,
},
utils::clonecell::CloneCell,
wire::{XdgPopupId, xdg_popup::*},
@ -46,6 +46,7 @@ pub trait XdgPopupParent {
fn post_commit(&self);
fn visible(&self) -> bool;
fn make_visible(self: Rc<Self>);
fn node_layer(&self) -> NodeLayerLink;
fn tray_item(&self) -> Option<TrayItemId> {
None
}
@ -324,6 +325,10 @@ impl Node for XdgPopup {
self.xdg.surface.node_location()
}
fn node_layer(&self) -> NodeLayerLink {
XdgSurfaceExt::node_layer(self)
}
fn node_find_tree_at(
&self,
x: i32,
@ -441,6 +446,13 @@ impl XdgSurfaceExt for XdgPopup {
fn make_visible(self: Rc<Self>) {
self.node_make_visible();
}
fn node_layer(&self) -> NodeLayerLink {
let Some(parent) = self.parent.get() else {
return NodeLayerLink::Display;
};
parent.node_layer()
}
}
#[derive(Debug, Error)]

14
src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs
View file

@ -27,9 +27,9 @@ use {
state::State,
tree::{
ContainerSplit, Direction, FindTreeResult, FindTreeUsecase, FoundNode, Node, NodeId,
NodeLocation, NodeVisitor, OutputNode, TileDragDestination, ToplevelData, ToplevelNode,
ToplevelNodeBase, ToplevelNodeId, ToplevelType, WorkspaceNode,
default_tile_drag_destination,
NodeLayerLink, NodeLocation, NodeVisitor, OutputNode, TileDragDestination,
ToplevelData, ToplevelNode, ToplevelNodeBase, ToplevelNodeId, ToplevelType,
WorkspaceNode, default_tile_drag_destination,
},
utils::{clonecell::CloneCell, hash_map_ext::HashMapExt},
wire::{XdgToplevelId, xdg_toplevel::*},
@ -577,6 +577,10 @@ impl Node for XdgToplevel {
self.xdg.surface.node_location()
}
fn node_layer(&self) -> NodeLayerLink {
self.toplevel_data.node_layer()
}
fn node_do_focus(self: Rc<Self>, seat: &Rc<WlSeatGlobal>, _direction: Direction) {
seat.focus_toplevel(self.clone());
}
@ -788,6 +792,10 @@ impl XdgSurfaceExt for XdgToplevel {
fn make_visible(self: Rc<Self>) {
self.node_make_visible();
}
fn node_layer(&self) -> NodeLayerLink {
self.toplevel_data.node_layer()
}
}
#[derive(Debug, Error)]