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

toplevel: remove focus_node

Browse source
This commit is contained in:
Julian Orth 2025-02-19 16:30:07 +01:00
parent 8c26e56b65
commit f4e8d132f3
8 changed files with 19 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ifs/wl_surface/wl_subsurface.rs
View file

@ -7,6 +7,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
tree::Node,
utils::{
clonecell::CloneCell,
linkedlist::{LinkedNode, NodeRef},
@ -375,6 +376,10 @@ impl SurfaceExt for WlSubsurface {
Some(self)
}
fn focus_node(&self) -> Option<Rc<dyn Node>> {
self.parent.ext.get().focus_node()
}
fn consume_pending_child(
&self,
surface: &WlSurface,

4
src/ifs/wl_surface/x_surface/xwindow.rs
View file

@ -4,7 +4,7 @@ use {
cursor::KnownCursor,
fixed::Fixed,
ifs::{
wl_seat::{tablet::TabletTool, NodeSeatState, SeatId, WlSeatGlobal},
wl_seat::{tablet::TabletTool, NodeSeatState, WlSeatGlobal},
wl_surface::{x_surface::XSurface, WlSurface, WlSurfaceError},
},
rect::Rect,
@ -406,7 +406,7 @@ impl ToplevelNodeBase for Xwindow {
.push(XWaylandEvent::Activate(self.data.clone()));
}
fn tl_focus_child(&self, _seat: SeatId) -> Option<Rc<dyn Node>> {
fn tl_focus_child(&self) -> Option<Rc<dyn Node>> {
Some(self.x.surface.clone())
}

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

@ -9,7 +9,7 @@ use {
fixed::Fixed,
ifs::{
ext_foreign_toplevel_list_v1::ExtForeignToplevelListV1,
wl_seat::{tablet::TabletTool, NodeSeatState, SeatId, WlSeatGlobal},
wl_seat::{tablet::TabletTool, NodeSeatState, WlSeatGlobal},
wl_surface::{
xdg_surface::{
xdg_toplevel::xdg_dialog_v1::XdgDialogV1, XdgSurface, XdgSurfaceError,
@ -582,7 +582,7 @@ impl ToplevelNodeBase for XdgToplevel {
}
}
fn tl_focus_child(&self, _seat: SeatId) -> Option<Rc<dyn Node>> {
fn tl_focus_child(&self) -> Option<Rc<dyn Node>> {
Some(self.xdg.surface.clone())
}