Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/shell/element/surface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ impl PartialEq<X11Surface> for CosmicSurface {
}
}

#[derive(Default)]
struct WasMaximized(AtomicBool);

#[derive(Default)]
struct Minimized(AtomicBool);

Expand Down Expand Up @@ -399,6 +402,16 @@ impl CosmicSurface {
}

pub fn set_maximized(&self, maximized: bool) {
let was_maximized = self.is_maximized(false);

// update was_maximized flag
self.0
.user_data()
.get_or_insert_threadsafe(WasMaximized::default)
.0
.store(was_maximized && !maximized, Ordering::SeqCst);


match self.0.underlying_surface() {
WindowSurface::Wayland(toplevel) => toplevel.with_pending_state(|state| {
if maximized {
Expand Down Expand Up @@ -432,6 +445,14 @@ impl CosmicSurface {
}
}

pub fn was_maximized(&self) -> bool {
self.0
.user_data()
.get_or_insert_threadsafe(WasMaximized::default)
.0
.load(Ordering::SeqCst)
}

pub fn is_sticky(&self) -> bool {
self.0
.user_data()
Expand Down
4 changes: 2 additions & 2 deletions src/shell/layout/floating/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -686,11 +686,11 @@ impl FloatingLayout {
mapped_geometry.size = last_size;
}
} else if !window.is_maximized(true) {
if window.active_window().has_pending_changes() {
if window.active_window().has_pending_changes() || window.active_window().was_maximized() {
if let Some(pending_size) = window.pending_size() {
mapped_geometry.size = pending_size.as_local();
}
}
}
*window.last_geometry.lock().unwrap() = Some(mapped_geometry);
}

Expand Down