1
0
Fork 0
forked from wry/wry

toplevel: rename is_floating to parent_is_float

This commit is contained in:
Julian Orth 2025-07-16 21:21:24 +02:00
parent a840eff108
commit a333198658
5 changed files with 11 additions and 11 deletions

View file

@ -1741,7 +1741,7 @@ impl ConfigProxyHandler {
fn handle_get_window_floating(&self, window: Window) -> Result<(), CphError> { fn handle_get_window_floating(&self, window: Window) -> Result<(), CphError> {
let window = self.get_window(window)?; let window = self.get_window(window)?;
self.respond(Response::GetWindowFloating { self.respond(Response::GetWindowFloating {
floating: window.tl_data().is_floating.get(), floating: window.tl_data().parent_is_float.get(),
}); });
Ok(()) Ok(())
} }

View file

@ -6,6 +6,6 @@ fixed_root_criterion!(TlmMatchFloating, floating);
impl CritFixedRootCriterion<ToplevelData> for TlmMatchFloating { impl CritFixedRootCriterion<ToplevelData> for TlmMatchFloating {
fn matches(&self, data: &ToplevelData) -> bool { fn matches(&self, data: &ToplevelData) -> bool {
data.is_floating.get() data.parent_is_float.get()
} }
} }

View file

@ -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 }); self.client.event(Floating { self_id: self.id });
} }
if data.visible.get() { if data.visible.get() {

View file

@ -582,7 +582,7 @@ impl WlSeatGlobal {
pub fn get_floating(self: &Rc<Self>) -> Option<bool> { pub fn get_floating(self: &Rc<Self>) -> Option<bool> {
match self.keyboard_node.get().node_toplevel() { 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, _ => None,
} }
} }

View file

@ -112,12 +112,12 @@ impl<T: ToplevelNodeBase> ToplevelNode for T {
data.mapped_during_iteration.set(data.state.eng.iteration()); data.mapped_during_iteration.set(data.state.eng.iteration());
data.property_changed(TL_CHANGED_NEW); 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(); let is_floating = parent.node_is_float();
if was_floating != is_floating { if was_floating != is_floating {
data.property_changed(TL_CHANGED_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()); self.tl_set_workspace(&parent.cnode_workspace());
} }
@ -173,7 +173,7 @@ impl<T: ToplevelNodeBase> ToplevelNode for T {
sc.buffer_size_changed(); sc.buffer_size_changed();
} }
} }
if data.is_floating.get() { if data.parent_is_float.get() {
data.float_width.set(rect.width()); data.float_width.set(rect.width());
data.float_height.set(rect.height()); data.float_height.set(rect.height());
} }
@ -316,7 +316,7 @@ pub struct ToplevelData {
pub state: Rc<State>, pub state: Rc<State>,
pub active_surfaces: ThresholdCounter, pub active_surfaces: ThresholdCounter,
pub visible: Cell<bool>, pub visible: Cell<bool>,
pub is_floating: Cell<bool>, pub parent_is_float: Cell<bool>,
pub float_width: Cell<i32>, pub float_width: Cell<i32>,
pub float_height: Cell<i32>, pub float_height: Cell<i32>,
pub pinned: Cell<bool>, pub pinned: Cell<bool>,
@ -369,7 +369,7 @@ impl ToplevelData {
state: state.clone(), state: state.clone(),
active_surfaces: Default::default(), active_surfaces: Default::default(),
visible: Cell::new(false), visible: Cell::new(false),
is_floating: Default::default(), parent_is_float: Default::default(),
float_width: Default::default(), float_width: Default::default(),
float_height: Default::default(), float_height: Default::default(),
pinned: Cell::new(false), pinned: Cell::new(false),
@ -910,7 +910,7 @@ pub fn toplevel_set_floating(state: &Rc<State>, tl: Rc<dyn ToplevelNode>, floati
if data.is_fullscreen.get() { if data.is_fullscreen.get() {
return; return;
} }
if data.is_floating.get() == floating { if data.parent_is_float.get() == floating {
return; return;
} }
let parent = match data.parent.get() { let parent = match data.parent.get() {
@ -949,7 +949,7 @@ pub fn toplevel_set_workspace(state: &Rc<State>, tl: Rc<dyn ToplevelNode>, ws: &
old_ws.clone().node_do_focus(&focus, Direction::Unspecified); 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); let (width, height) = tl.tl_data().float_size(ws);
state.map_floating(tl.clone(), width, height, ws, None); state.map_floating(tl.clone(), width, height, ws, None);
} else { } else {