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

shell: Support maximize and fullscreen requests

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-10-24 18:32:53 +02:00
parent f59bb8a06e
commit bb07ab4155
5 changed files with 166 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -155,30 +155,34 @@ impl FloatingLayout {
self.space.element_geometry(elem)
}
pub fn maximize_request(&mut self, window: &CosmicMapped, output: &Output) {
let layers = layer_map_for_output(&output);
let geometry = layers.non_exclusive_zone();
if let Some(location) = self.space.element_location(window) {
*window.last_geometry.lock().unwrap() = Some(Rectangle::from_loc_and_size(
location,
window.geometry().size,
));
pub fn maximize_request(&mut self, window: &Window) {
if let Some(mapped) = self
.space
.elements()
.find(|m| m.windows().any(|(w, _)| &w == window))
{
if let Some(location) = self.space.element_location(mapped) {
*mapped.last_geometry.lock().unwrap() = Some(Rectangle::from_loc_and_size(
location,
mapped.geometry().size,
));
}
}
self.space.map_element(window.clone(), geometry.loc, true);
window.set_maximized(true);
window.set_size(geometry.size);
window.configure();
}
pub fn unmaximize_request(&mut self, window: &CosmicMapped) {
let last_geometry = window.last_geometry.lock().unwrap().clone();
window.set_maximized(false);
window.set_size(last_geometry.map(|g| g.size).expect("No previous size?"));
window.configure();
let last_location = last_geometry.map(|g| g.loc).expect("No previous location?");
self.space.map_element(window.clone(), last_location, true);
pub fn unmaximize_request(&mut self, window: &Window) {
let maybe_mapped = self
.space
.elements()
.find(|m| m.windows().any(|(w, _)| &w == window))
.cloned();
if let Some(mapped) = maybe_mapped {
let last_geometry = mapped.last_geometry.lock().unwrap().clone();
mapped.set_size(last_geometry.map(|g| g.size).expect("No previous size?"));
let last_location = last_geometry.map(|g| g.loc).expect("No previous location?");
self.space.map_element(mapped, last_location, true);
}
}
/*

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

@ -795,7 +795,7 @@ impl TilingLayout {
}
},
Data::Mapped { mapped, .. } => {
if !mapped.is_fullscreen() {
if !(mapped.is_fullscreen() || mapped.is_maximized()) {
mapped.set_tiled(true);
mapped.set_size(
(geo.size.w - inner * 2, geo.size.h - inner * 2).into(),