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

workspace: Consistently set minimized state

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-06-30 19:54:09 +02:00 • committed by Victoria Brekenfeld
parent 9d3678e908
commit 83ed79af16
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -611,7 +611,6 @@ impl FloatingLayout {
)); ));
} }
mapped.set_minimized(false);
self.space self.space
.map_element(mapped.clone(), position.as_logical(), true); .map_element(mapped.clone(), position.as_logical(), true);
self.space.refresh(); self.space.refresh();

7
src/shell/workspace.rs
View file

@ -996,6 +996,8 @@ impl Workspace {
.unwrap_or(FULLSCREEN_ANIMATION_DURATION)), .unwrap_or(FULLSCREEN_ANIMATION_DURATION)),
); );
} }
fullscreen_state.surface.set_minimized(true);
return Some(MinimizedWindow::Fullscreen { return Some(MinimizedWindow::Fullscreen {
surface: fullscreen_state.surface, surface: fullscreen_state.surface,
previous: fullscreen_state previous: fullscreen_state
@ -1018,6 +1020,7 @@ impl Workspace {
if let Some(elem) = maybe_elem { if let Some(elem) = maybe_elem {
let was_maximized = self.floating_layer.unmap(&elem, None).is_some(); let was_maximized = self.floating_layer.unmap(&elem, None).is_some();
let previous_state = self.tiling_layer.unmap(&elem, Some(to)).unwrap(); let previous_state = self.tiling_layer.unmap(&elem, Some(to)).unwrap();
elem.set_minimized(true);
return Some(MinimizedWindow::Tiling { return Some(MinimizedWindow::Tiling {
window: elem, window: elem,
previous: TilingRestoreData { previous: TilingRestoreData {
@ -1034,6 +1037,7 @@ impl Workspace {
.cloned(); .cloned();
if let Some(elem) = maybe_elem { if let Some(elem) = maybe_elem {
let geometry = self.floating_layer.unmap(&elem, Some(to)).unwrap(); let geometry = self.floating_layer.unmap(&elem, Some(to)).unwrap();
elem.set_minimized(true);
return Some(MinimizedWindow::Floating { return Some(MinimizedWindow::Floating {
window: elem, window: elem,
previous: FloatingRestoreData { previous: FloatingRestoreData {
@ -1059,6 +1063,7 @@ impl Workspace {
match window { match window {
MinimizedWindow::Fullscreen { previous, surface } => { MinimizedWindow::Fullscreen { previous, surface } => {
let old_fullscreen = self.remove_fullscreen(); let old_fullscreen = self.remove_fullscreen();
surface.set_minimized(false);
self.fullscreen = Some(FullscreenSurface { self.fullscreen = Some(FullscreenSurface {
surface, surface,
previous_state: previous.clone().map(|p| p.previous_state), previous_state: previous.clone().map(|p| p.previous_state),
@ -1072,6 +1077,7 @@ impl Workspace {
let current_output_size = self.output.geometry().size.as_logical(); let current_output_size = self.output.geometry().size.as_logical();
let previous_position = previous.position_relative(current_output_size); let previous_position = previous.position_relative(current_output_size);
window.set_minimized(false);
self.floating_layer self.floating_layer
.remap_minimized(window, from, previous_position); .remap_minimized(window, from, previous_position);
None None
@ -1084,6 +1090,7 @@ impl Workspace {
was_maximized, was_maximized,
}, },
} => { } => {
window.set_minimized(false);
if self.tiling_enabled { if self.tiling_enabled {
let focus_stack = self.focus_stack.get(seat); let focus_stack = self.focus_stack.get(seat);
self.tiling_layer self.tiling_layer