leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: Populate focus_stack when unstacking

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-07-03 21:04:28 +02:00
parent dc882ffc36
commit b9a323c9ff
4 changed files with 61 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/shell/layout/floating/mod.rs
View file

@ -882,7 +882,11 @@ impl FloatingLayout {
true
}
pub fn toggle_stacking(&mut self, mapped: &CosmicMapped) -> Option<KeyboardFocusTarget> {
pub fn toggle_stacking(
&mut self,
mapped: &CosmicMapped,
mut focus_stack: FocusStackMut,
) -> Option<KeyboardFocusTarget> {
if !self.space.elements().any(|m| m == mapped) {
return None;
}
@ -902,20 +906,24 @@ impl FloatingLayout {
Some(geo.size),
None,
);
focus_stack.append(&mapped);
Some(KeyboardFocusTarget::Element(mapped))
} else {
// if we have a stack
let mut surfaces = mapped.windows().map(|(s, _)| s).collect::<VecDeque<_>>();
let first = surfaces.pop_front().expect("Stack without a window?");
let focused = mapped.active_window();
self.space.unmap_elem(&mapped);
let handle = mapped.loop_handle();
mapped.convert_to_surface(first, (&output, mapped.bbox()), self.theme.clone());
let mut new_elements = vec![mapped.clone()];
// map the rest
for other in surfaces {
other.try_force_undecorated(false);
other.set_tiled(false);
let focused = other == focused;
let window = CosmicMapped::from(CosmicWindow::new(
other,
handle.clone(),
@ -928,10 +936,19 @@ impl FloatingLayout {
window.set_bounds(layer_map.non_exclusive_zone().size);
}
if focused {
new_elements.insert(0, window.clone());
} else {
new_elements.push(window.clone());
}
self.map(window, None);
}
self.space.map_element(mapped.clone(), location, false);
for elem in new_elements.into_iter().rev() {
focus_stack.append(&elem);
}
Some(KeyboardFocusTarget::Element(mapped))
}
}
@ -939,16 +956,14 @@ impl FloatingLayout {
pub fn toggle_stacking_focused<'a>(
&mut self,
seat: &Seat<State>,
mut focus_stack: FocusStackMut,
focus_stack: FocusStackMut,
) -> Option<KeyboardFocusTarget> {
let Some(KeyboardFocusTarget::Element(elem)) = seat.get_keyboard().unwrap().current_focus()
else {
return None;
};
let res = self.toggle_stacking(&elem);
focus_stack.append(&elem);
res
self.toggle_stacking(&elem, focus_stack)
}
pub fn move_element<'a>(

34
src/shell/layout/tiling/mod.rs
View file

@ -2108,7 +2108,11 @@ impl TilingLayout {
}
}
pub fn toggle_stacking(&mut self, mapped: &CosmicMapped) -> Option<KeyboardFocusTarget> {
pub fn toggle_stacking(
&mut self,
mapped: &CosmicMapped,
mut focus_stack: FocusStackMut,
) -> Option<KeyboardFocusTarget> {
let gaps = self.gaps();
let Some(node_id) = mapped.tiling_node_id.lock().unwrap().clone() else {
@ -2125,6 +2129,7 @@ impl TilingLayout {
match tree.get_mut(&node_id).unwrap().data_mut() {
Data::Mapped { mapped, .. } => {
mapped.convert_to_stack((&self.output, mapped.bbox()), self.theme.clone());
focus_stack.append(&mapped);
KeyboardFocusTarget::Element(mapped.clone())
}
_ => unreachable!(),
@ -2133,6 +2138,9 @@ impl TilingLayout {
// if we have a stack
let mut surfaces = mapped.windows().map(|(s, _)| s);
let first = surfaces.next().expect("Stack without a window?");
let focused = mapped.active_window();
let mut new_elements = Vec::new();
let handle = match tree.get_mut(&node_id).unwrap().data_mut() {
Data::Mapped { mapped, .. } => {
@ -2142,6 +2150,7 @@ impl TilingLayout {
(&self.output, mapped.bbox()),
self.theme.clone(),
);
new_elements.push(mapped.clone());
handle
}
_ => unreachable!(),
@ -2152,6 +2161,7 @@ impl TilingLayout {
for other in surfaces {
other.try_force_undecorated(false);
other.set_tiled(false);
let focused = other == focused;
let window = CosmicMapped::from(CosmicWindow::new(
other,
handle.clone(),
@ -2174,6 +2184,11 @@ impl TilingLayout {
);
let node = window.tiling_node_id.lock().unwrap().clone().unwrap();
if focused {
new_elements.insert(0, window);
} else {
new_elements.push(window);
}
current_node = node;
}
@ -2184,15 +2199,20 @@ impl TilingLayout {
node_id
};
for elem in new_elements.iter().rev() {
focus_stack.append(elem);
}
match tree.get(&node_id).unwrap().data() {
Data::Group { alive, .. } => KeyboardFocusTarget::Group(WindowGroup {
node: node_id.clone(),
alive: Arc::downgrade(alive),
focus_stack: tree
.children_ids(&node_id)
focus_stack: vec![new_elements[0]
.tiling_node_id
.lock()
.unwrap()
.cloned()
.collect::<Vec<_>>(),
.clone()
.unwrap()],
}),
Data::Mapped { mapped, .. } => KeyboardFocusTarget::Element(mapped.clone()),
_ => unreachable!(),
@ -2222,9 +2242,7 @@ impl TilingLayout {
{
match last_active_data {
FocusedNodeData::Window(mapped) => {
let res = self.toggle_stacking(&mapped);
focus_stack.append(&mapped);
return res;
return self.toggle_stacking(&mapped, focus_stack);
}
FocusedNodeData::Group(_, _) => {
let mut handle = None;