diff --git a/src/config/handler.rs b/src/config/handler.rs index b5bcc141..84159f90 100644 --- a/src/config/handler.rs +++ b/src/config/handler.rs @@ -1741,7 +1741,7 @@ impl ConfigProxyHandler { fn handle_get_window_floating(&self, window: Window) -> Result<(), CphError> { let window = self.get_window(window)?; self.respond(Response::GetWindowFloating { - floating: window.tl_data().is_floating.get(), + floating: window.tl_data().parent_is_float.get(), }); Ok(()) } diff --git a/src/criteria/tlm/tlm_matchers/tlmm_floating.rs b/src/criteria/tlm/tlm_matchers/tlmm_floating.rs index 0386fa0a..8cb2dc5e 100644 --- a/src/criteria/tlm/tlm_matchers/tlmm_floating.rs +++ b/src/criteria/tlm/tlm_matchers/tlmm_floating.rs @@ -6,6 +6,6 @@ fixed_root_criterion!(TlmMatchFloating, floating); impl CritFixedRootCriterion for TlmMatchFloating { fn matches(&self, data: &ToplevelData) -> bool { - data.is_floating.get() + data.parent_is_float.get() } } diff --git a/src/ifs/jay_tree_query.rs b/src/ifs/jay_tree_query.rs index 1171a89c..a6cd940c 100644 --- a/src/ifs/jay_tree_query.rs +++ b/src/ifs/jay_tree_query.rs @@ -197,7 +197,7 @@ impl JayTreeQuery { } } } - if data.is_floating.get() { + if data.parent_is_float.get() { self.client.event(Floating { self_id: self.id }); } if data.visible.get() { diff --git a/src/ifs/wl_seat.rs b/src/ifs/wl_seat.rs index 12d752ea..eb9bd004 100644 --- a/src/ifs/wl_seat.rs +++ b/src/ifs/wl_seat.rs @@ -582,7 +582,7 @@ impl WlSeatGlobal { pub fn get_floating(self: &Rc) -> Option { match self.keyboard_node.get().node_toplevel() { - Some(tl) => Some(tl.tl_data().is_floating.get()), + Some(tl) => Some(tl.tl_data().parent_is_float.get()), _ => None, } } diff --git a/src/tree/toplevel.rs b/src/tree/toplevel.rs index 7033d85a..e79679ed 100644 --- a/src/tree/toplevel.rs +++ b/src/tree/toplevel.rs @@ -112,12 +112,12 @@ impl ToplevelNode for T { data.mapped_during_iteration.set(data.state.eng.iteration()); data.property_changed(TL_CHANGED_NEW); } - let was_floating = data.is_floating.get(); + let was_floating = data.parent_is_float.get(); let is_floating = parent.node_is_float(); if was_floating != is_floating { data.property_changed(TL_CHANGED_FLOATING); } - data.is_floating.set(is_floating); + data.parent_is_float.set(is_floating); self.tl_set_workspace(&parent.cnode_workspace()); } @@ -173,7 +173,7 @@ impl ToplevelNode for T { sc.buffer_size_changed(); } } - if data.is_floating.get() { + if data.parent_is_float.get() { data.float_width.set(rect.width()); data.float_height.set(rect.height()); } @@ -316,7 +316,7 @@ pub struct ToplevelData { pub state: Rc, pub active_surfaces: ThresholdCounter, pub visible: Cell, - pub is_floating: Cell, + pub parent_is_float: Cell, pub float_width: Cell, pub float_height: Cell, pub pinned: Cell, @@ -369,7 +369,7 @@ impl ToplevelData { state: state.clone(), active_surfaces: Default::default(), visible: Cell::new(false), - is_floating: Default::default(), + parent_is_float: Default::default(), float_width: Default::default(), float_height: Default::default(), pinned: Cell::new(false), @@ -910,7 +910,7 @@ pub fn toplevel_set_floating(state: &Rc, tl: Rc, floati if data.is_fullscreen.get() { return; } - if data.is_floating.get() == floating { + if data.parent_is_float.get() == floating { return; } let parent = match data.parent.get() { @@ -949,7 +949,7 @@ pub fn toplevel_set_workspace(state: &Rc, tl: Rc, ws: & old_ws.clone().node_do_focus(&focus, Direction::Unspecified); } } - if tl.tl_data().is_floating.get() { + if tl.tl_data().parent_is_float.get() { let (width, height) = tl.tl_data().float_size(ws); state.map_floating(tl.clone(), width, height, ws, None); } else {