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

tree: unify toplevel active changes

Browse source
This commit is contained in:
Julian Orth 2024-03-04 13:49:05 +01:00
parent 3dfdc26592
commit 2445226cbe
5 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tree/container.rs
View file

@ -1128,10 +1128,7 @@ impl Node for ContainerNode {
}
fn node_active_changed(&self, active: bool) {
self.toplevel_data.active.set(active);
if let Some(parent) = self.toplevel_data.parent.get() {
parent.node_child_active_changed(self, active, 1);
}
self.toplevel_data.update_self_active(self, active);
}
fn node_find_tree_at(&self, x: i32, y: i32, tree: &mut Vec<FoundNode>) -> FindTreeResult {

5
src/tree/placeholder.rs
View file

@ -113,10 +113,7 @@ impl Node for PlaceholderNode {
}
fn node_active_changed(&self, active: bool) {
self.toplevel.active.set(active);
if let Some(parent) = self.toplevel.parent.get() {
parent.node_child_active_changed(self, active, 1);
}
self.toplevel.update_self_active(self, active);
}
fn node_find_tree_at(&self, _x: i32, _y: i32, _tree: &mut Vec<FoundNode>) -> FindTreeResult {

40
src/tree/toplevel.rs
View file

@ -58,21 +58,9 @@ impl<T: ToplevelNodeBase> ToplevelNode for T {
fn tl_surface_active_changed(&self, active: bool) {
let data = self.tl_data();
if active {
if data.active_surfaces.inc() {
self.tl_set_active(true);
if let Some(parent) = data.parent.get() {
parent.node_child_active_changed(self.tl_as_node(), true, 1);
}
}
} else {
if data.active_surfaces.dec() {
self.tl_set_active(false);
if let Some(parent) = data.parent.get() {
parent.node_child_active_changed(self.tl_as_node(), false, 1);
}
}
}
data.update_active(self, || {
data.active_surfaces.adj(active);
});
}
fn tl_set_fullscreen(self: Rc<Self>, fullscreen: bool) {
@ -193,7 +181,7 @@ pub struct FullscreenedData {
}
pub struct ToplevelData {
pub active: Cell<bool>,
pub self_active: Cell<bool>,
pub client: Option<Rc<Client>>,
pub state: Rc<State>,
pub active_surfaces: ThresholdCounter,
@ -220,7 +208,7 @@ pub struct ToplevelData {
impl ToplevelData {
pub fn new(state: &Rc<State>, title: String, client: Option<Rc<Client>>) -> Self {
Self {
active: Cell::new(false),
self_active: Cell::new(false),
client,
state: state.clone(),
active_surfaces: Default::default(),
@ -245,7 +233,23 @@ impl ToplevelData {
}
pub fn active(&self) -> bool {
self.active_surfaces.active() || self.active.get()
self.active_surfaces.active() || self.self_active.get()
}
fn update_active<T: ToplevelNode, F: FnOnce()>(&self, tl: &T, f: F) {
let active_old = self.active();
f();
let active_new = self.active();
if active_old != active_new {
tl.tl_set_active(active_new);
if let Some(parent) = self.parent.get() {
parent.node_child_active_changed(tl.tl_as_node(), active_new, 1);
}
}
}
pub fn update_self_active<T: ToplevelNode>(&self, node: &T, active: bool) {
self.update_active(node, || self.self_active.set(active));
}
pub fn float_size(&self, ws: &WorkspaceNode) -> (i32, i32) {