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

toplevel: store containing float

Browse source
This commit is contained in:
Julian Orth 2025-07-16 21:21:00 +02:00
parent a333198658
commit a97e92ccea
4 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/tree/toplevel.rs
View file

@ -26,8 +26,8 @@ use {
rect::Rect,
state::State,
tree::{
ContainerNode, ContainerSplit, ContainingNode, Direction, Node, NodeId, OutputNode,
PlaceholderNode, WorkspaceNode,
ContainerNode, ContainerSplit, ContainingNode, Direction, FloatNode, Node, NodeId,
OutputNode, PlaceholderNode, WorkspaceNode,
},
utils::{
array_to_tuple::ArrayToTuple,
@ -35,6 +35,7 @@ use {
copyhashmap::CopyHashMap,
hash_map_ext::HashMapExt,
numcell::NumCell,
rc_eq::rc_eq,
threshold_counter::ThresholdCounter,
toplevel_identifier::{ToplevelIdentifier, toplevel_identifier},
},
@ -67,6 +68,7 @@ pub trait ToplevelNode: ToplevelNodeBase {
fn tl_destroy(&self);
fn tl_pinned(&self) -> bool;
fn tl_set_pinned(&self, self_pinned: bool, pinned: bool);
fn tl_set_float(&self, float: Option<&Rc<FloatNode>>);
}
impl<T: ToplevelNodeBase> ToplevelNode for T {
@ -118,7 +120,19 @@ impl<T: ToplevelNodeBase> ToplevelNode for T {
data.property_changed(TL_CHANGED_FLOATING);
}
data.parent_is_float.set(is_floating);
self.tl_set_workspace(&parent.cnode_workspace());
self.tl_set_workspace(&parent.clone().cnode_workspace());
{
let float = parent.cnode_get_float();
let prev = data.float.set(float.clone());
let same = match (&prev, &float) {
(None, None) => true,
(Some(prev), Some(float)) => rc_eq(prev, float),
_ => false,
};
if !same {
self.tl_push_float(float.as_ref());
}
}
}
fn tl_extents_changed(&self) {
@ -207,6 +221,11 @@ impl<T: ToplevelNodeBase> ToplevelNode for T {
};
parent.cnode_set_pinned(pinned);
}
fn tl_set_float(&self, float: Option<&Rc<FloatNode>>) {
self.tl_data().float.set(float.cloned());
self.tl_push_float(float);
}
}
pub trait ToplevelNodeBase: Node {
@ -266,6 +285,10 @@ pub trait ToplevelNodeBase: Node {
.is_some()
.then_some(self.node_absolute_position())
}
fn tl_push_float(&self, float: Option<&Rc<FloatNode>>) {
let _ = float;
}
}
pub struct FullscreenedData {
@ -317,6 +340,7 @@ pub struct ToplevelData {
pub active_surfaces: ThresholdCounter,
pub visible: Cell<bool>,
pub parent_is_float: Cell<bool>,
pub float: CloneCell<Option<Rc<FloatNode>>>,
pub float_width: Cell<i32>,
pub float_height: Cell<i32>,
pub pinned: Cell<bool>,
@ -370,6 +394,7 @@ impl ToplevelData {
active_surfaces: Default::default(),
visible: Cell::new(false),
parent_is_float: Default::default(),
float: Default::default(),
float_width: Default::default(),
float_height: Default::default(),
pinned: Cell::new(false),
@ -491,6 +516,7 @@ impl ToplevelData {
if let Some(parent) = self.parent.take() {
parent.cnode_remove_child(node);
}
self.float.take();
self.workspace.take();
self.seat_state.destroy_node(node);
}