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

floating: Fix maximize animation again

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-02-23 22:49:29 +01:00 • committed by Victoria Brekenfeld
parent 745267ac24
commit 4e09fc0398
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -122,6 +122,7 @@ impl Animation {
fn geometry( fn geometry(
&self, &self,
output_geometry: Rectangle<i32, Logical>, output_geometry: Rectangle<i32, Logical>,
current_geometry: Rectangle<i32, Local>,
tiled_state: Option<&TiledCorners>, tiled_state: Option<&TiledCorners>,
) -> Rectangle<i32, Local> { ) -> Rectangle<i32, Local> {
let target_rect = match self { let target_rect = match self {
@ -131,15 +132,13 @@ impl Animation {
| Animation::Unminimize { | Animation::Unminimize {
target_geometry, .. target_geometry, ..
} => target_geometry.clone(), } => target_geometry.clone(),
Animation::Tiled { Animation::Tiled { .. } => {
previous_geometry, ..
} => {
if let Some(target_rect) = if let Some(target_rect) =
tiled_state.map(|state| state.relative_geometry(output_geometry)) tiled_state.map(|state| state.relative_geometry(output_geometry))
{ {
target_rect target_rect
} else { } else {
previous_geometry.clone() current_geometry
} }
} }
}; };
@ -951,13 +950,15 @@ impl FloatingLayout {
let output_geometry = layers.non_exclusive_zone(); let output_geometry = layers.non_exclusive_zone();
std::mem::drop(layers); std::mem::drop(layers);
let current_geometry = self
.space
.element_geometry(focused)
.map(RectExt::as_local)
.unwrap();
let start_rectangle = if let Some(anim) = self.animations.remove(focused) { let start_rectangle = if let Some(anim) = self.animations.remove(focused) {
anim.geometry(output_geometry, tiled_state.as_ref()) anim.geometry(output_geometry, current_geometry, tiled_state.as_ref())
} else { } else {
self.space current_geometry
.element_geometry(focused)
.map(RectExt::as_local)
.unwrap()
}; };
let new_state = match (direction, &*tiled_state) { let new_state = match (direction, &*tiled_state) {
@ -1185,6 +1186,10 @@ impl FloatingLayout {
let original_geo = anim.previous_geometry(); let original_geo = anim.previous_geometry();
geometry = anim.geometry( geometry = anim.geometry(
output_geometry, output_geometry,
self.space
.element_geometry(elem)
.map(RectExt::as_local)
.unwrap_or(geometry),
elem.floating_tiled.lock().unwrap().as_ref(), elem.floating_tiled.lock().unwrap().as_ref(),
); );