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

stacking: Correctly restore decoration state

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-06-14 16:43:13 +02:00
parent 5cdf614692
commit 5884e287a5
4 changed files with 47 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shell/element/mod.rs
View file

@ -505,6 +505,8 @@ impl CosmicMapped {
outputs: impl Iterator<Item = (&'a Output, Rectangle<i32, Logical>)>,
) {
let handle = self.loop_handle();
surface.try_force_undecorated(false);
surface.set_tiled(false);
let window = CosmicWindow::new(surface, handle);
if let Some(geo) = self.last_geometry.lock().unwrap().clone() {

20
src/shell/element/surface.rs
View file

@ -1,4 +1,4 @@
use std::{cell::RefCell, time::Duration};
use std::time::Duration;
use smithay::{
backend::renderer::{
@ -38,7 +38,7 @@ use smithay::{
xwayland::{xwm::X11Relatable, X11Surface},
};
use crate::state::SurfaceDmabufFeedback;
use crate::{state::SurfaceDmabufFeedback, wayland::handlers::decoration::PreferredDecorationMode};
space_elements! {
#[derive(Debug, Clone, PartialEq)]
@ -195,22 +195,14 @@ impl CosmicSurface {
if enable {
let previous_decoration_state =
window.toplevel().current_state().decoration_mode.clone();
window
.user_data()
.insert_if_missing(|| RefCell::new(Option::<DecorationMode>::None));
*window
.user_data()
.get::<RefCell<Option<DecorationMode>>>()
.unwrap()
.borrow_mut() = previous_decoration_state;
if PreferredDecorationMode::is_unset(window) {
PreferredDecorationMode::update(window, previous_decoration_state);
}
window.toplevel().with_pending_state(|pending| {
pending.decoration_mode = Some(DecorationMode::ServerSide);
});
} else {
let previous_mode = window
.user_data()
.get::<RefCell<Option<DecorationMode>>>()
.and_then(|m| m.borrow().clone());
let previous_mode = PreferredDecorationMode::mode(window);
window.toplevel().with_pending_state(|pending| {
pending.decoration_mode = previous_mode;
});

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

@ -1217,6 +1217,8 @@ impl TilingLayout {
// map the rest
for other in surfaces {
other.try_force_undecorated(false);
other.set_tiled(false);
let window =
CosmicMapped::from(CosmicWindow::new(other, handle.clone()));
window.output_enter(&output, window.bbox());