shell: Fix moving fullscreen windows

This commit is contained in:
Victoria Brekenfeld 2023-10-24 15:58:53 +02:00
parent 3901e637b0
commit 724a4170df
2 changed files with 44 additions and 4 deletions

View file

@ -479,7 +479,12 @@ impl Workspace {
window: &CosmicSurface,
previously: Option<(ManagedLayer, WorkspaceHandle)>,
) {
if self.fullscreen.is_some() {
if self
.fullscreen
.as_ref()
.filter(|f| f.ended_at.is_none())
.is_some()
{
return;
}
@ -516,7 +521,11 @@ impl Workspace {
&mut self,
window: &CosmicSurface,
) -> Option<(ManagedLayer, WorkspaceHandle)> {
if let Some(f) = self.fullscreen.as_mut().filter(|f| &f.surface == window) {
if let Some(f) = self
.fullscreen
.as_mut()
.filter(|f| &f.surface == window && f.ended_at.is_none())
{
window.set_fullscreen(false);
window.set_geometry(f.original_geometry);