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

tiling: Fix stack indicator rendering

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-09-14 16:18:13 +02:00
parent 19d5ed92f4
commit 973b360514
1 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4968,7 +4968,25 @@ where
} }
if focused.as_ref() == Some(&node_id) if focused.as_ref() == Some(&node_id)
&& swap_desc.as_ref().map(|desc| &desc.node) != Some(&node_id) && (swap_desc.as_ref().map(|desc| &desc.node) != Some(&node_id)
|| swap_desc
.as_ref()
.and_then(|swap_desc| swap_desc.stack_window.as_ref())
.zip(focused.as_ref())
.map(|(stack_window, focused_id)| {
target_tree
.get(focused_id)
.ok()
.map(|focused| match focused.data() {
Data::Mapped { mapped, .. } => mapped
.stack_ref()
.map(|stack| &stack.active() != stack_window)
.unwrap_or(false),
_ => unreachable!(),
})
.unwrap_or(false)
})
.unwrap_or(false))
{ {
if let Some(swap) = swap_indicator.as_ref() { if let Some(swap) = swap_indicator.as_ref() {
swap.resize(geo.size); swap.resize(geo.size);
@ -5037,8 +5055,21 @@ where
); );
if swap_desc if swap_desc
.as_ref() .as_ref()
.map(|swap_desc| { .filter(|swap_desc| swap_desc.node == node_id)
&swap_desc.node == &node_id && swap_desc.stack_window.is_some() .and_then(|swap_desc| swap_desc.stack_window.as_ref())
.zip(focused.as_ref())
.map(|(stack_window, focused_id)| {
target_tree
.get(focused_id)
.ok()
.map(|focused| match focused.data() {
Data::Mapped { mapped, .. } => mapped
.stack_ref()
.map(|stack| &stack.active() == stack_window)
.unwrap_or(false),
_ => unreachable!(),
})
.unwrap_or(false)
}) })
.unwrap_or(false) .unwrap_or(false)
{ {