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

autocommit 2022-04-20 18:33:59 CEST

Browse source
This commit is contained in:
Julian Orth 2022-04-20 18:33:59 +02:00
parent 1227ede560
commit 34e665cd8b
9 changed files with 82 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tree/workspace.rs
View file

@ -56,6 +56,9 @@ impl SizedNode for WorkspaceNode {
self.output.get().node_remove_child(self);
}
self.output_link.set(None);
if let Some(fs) = self.fullscreen.take() {
fs.into_node().node_destroy(false);
}
if let Some(container) = self.container.take() {
container.node_destroy(false);
}
@ -84,6 +87,9 @@ impl SizedNode for WorkspaceNode {
}
fn last_active_child(self: &Rc<Self>) -> Rc<dyn Node> {
if let Some(fs) = self.fullscreen.get() {
return fs.into_node().node_last_active_child();
}
if let Some(c) = self.container.get() {
return c.last_active_child();
}
@ -92,14 +98,18 @@ impl SizedNode for WorkspaceNode {
fn set_visible(&self, visible: bool) {
self.visible.set(visible);
if let Some(container) = self.container.get() {
if let Some(fs) = self.fullscreen.get() {
fs.as_node().node_set_visible(visible);
} else if let Some(container) = self.container.get() {
container.node_set_visible(visible);
}
self.seat_state.set_visible(self, visible);
}
fn do_focus(self: &Rc<Self>, seat: &Rc<WlSeatGlobal>, direction: Direction) {
if let Some(container) = self.container.get() {
if let Some(fs) = self.fullscreen.get() {
fs.into_node().node_do_focus(seat, direction);
} else if let Some(container) = self.container.get() {
container.do_focus(seat, direction);
}
}