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

shell: Rework maximize/fullscreen

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-10-25 19:41:30 +02:00
parent 72df9d07e6
commit 69563420fb
10 changed files with 295 additions and 435 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/shell/focus/mod.rs
View file

@ -100,11 +100,9 @@ impl Shell {
// update FocusStack and notify layouts about new focus (if any window)
let element = match target {
Some(KeyboardFocusTarget::Element(mapped)) => Some(mapped.clone()),
Some(KeyboardFocusTarget::Fullscreen(window)) => state
.common
.shell
.element_for_surface(&window.surface())
.cloned(),
Some(KeyboardFocusTarget::Fullscreen(window)) => {
state.common.shell.element_for_surface(window).cloned()
}
_ => None,
};
@ -237,7 +235,7 @@ impl Common {
let workspace = state.common.shell.active_space(&output);
let focus_stack = workspace.focus_stack.get(&seat);
if focus_stack.last().map(|m| m == &mapped).unwrap_or(false)
&& workspace.get_fullscreen(&output).is_none()
&& workspace.get_fullscreen().is_none()
{
continue; // Focus is valid
} else {
@ -268,9 +266,9 @@ impl Common {
if focus_stack
.last()
.map(|m| m.has_active_window(&window.surface()))
.map(|m| m.has_active_window(&window))
.unwrap_or(false)
&& workspace.get_fullscreen(&output).is_some()
&& workspace.get_fullscreen().is_some()
{
continue; // Focus is valid
} else {
@ -313,7 +311,7 @@ impl Common {
.common
.shell
.active_space(&output)
.get_fullscreen(&output)
.get_fullscreen()
.cloned()
.map(KeyboardFocusTarget::Fullscreen)
.or_else(|| {