From 4073f9f52287781a438ddfad3a37b630394ba29d Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sun, 12 May 2024 08:42:43 +0400
Subject: closing_window: Remove starting_alpha/scale

---
 src/layout/closing_window.rs | 15 ++-------------
 src/layout/tile.rs           |  4 ++--
 src/layout/workspace.rs      | 12 ------------
 3 files changed, 4 insertions(+), 27 deletions(-)

(limited to 'src/layout')

diff --git a/src/layout/closing_window.rs b/src/layout/closing_window.rs
index 29b2dd7c..2312f9f1 100644
--- a/src/layout/closing_window.rs
+++ b/src/layout/closing_window.rs
@@ -49,12 +49,6 @@ pub struct ClosingWindow {
 
     /// The closing animation.
     anim: Animation,
-
-    /// Alpha the animation should start from.
-    starting_alpha: f32,
-
-    /// Scale the animation should start from.
-    starting_scale: f64,
 }
 
 niri_render_elements! {
@@ -64,7 +58,6 @@ niri_render_elements! {
 }
 
 impl ClosingWindow {
-    #[allow(clippy::too_many_arguments)]
     pub fn new<E: RenderElement<GlesRenderer>>(
         renderer: &mut GlesRenderer,
         snapshot: RenderSnapshot<E, E>,
@@ -72,8 +65,6 @@ impl ClosingWindow {
         center: Point<i32, Logical>,
         pos: Point<i32, Logical>,
         anim: Animation,
-        starting_alpha: f32,
-        starting_scale: f64,
     ) -> anyhow::Result<Self> {
         let _span = tracy_client::span!("ClosingWindow::new");
 
@@ -109,8 +100,6 @@ impl ClosingWindow {
             texture_offset,
             blocked_out_texture_offset,
             anim,
-            starting_alpha,
-            starting_scale,
         })
     }
 
@@ -143,7 +132,7 @@ impl ClosingWindow {
             texture.clone(),
             self.texture_scale.x as i32,
             Transform::Normal,
-            Some(val.clamp(0., 1.) as f32 * self.starting_alpha),
+            Some(val.clamp(0., 1.) as f32),
             None,
             None,
             None,
@@ -155,7 +144,7 @@ impl ClosingWindow {
         let elem = RescaleRenderElement::from_element(
             elem,
             (self.center.to_f64() - offset).to_physical_precise_round(scale),
-            ((val / 5. + 0.8) * self.starting_scale).max(0.),
+            (val / 5. + 0.8).max(0.),
         );
 
         let mut location = self.pos.to_f64() + offset;
diff --git a/src/layout/tile.rs b/src/layout/tile.rs
index 0c50ea39..7f9c6e75 100644
--- a/src/layout/tile.rs
+++ b/src/layout/tile.rs
@@ -854,7 +854,7 @@ impl<W: LayoutElement> Tile<W> {
     ) -> TileRenderSnapshot {
         let _span = tracy_client::span!("Tile::render_snapshot");
 
-        let contents = self.render_inner(
+        let contents = self.render(
             renderer,
             Point::from((0, 0)),
             scale,
@@ -863,7 +863,7 @@ impl<W: LayoutElement> Tile<W> {
         );
 
         // A bit of a hack to render blocked out as for screencast, but I think it's fine here.
-        let blocked_out_contents = self.render_inner(
+        let blocked_out_contents = self.render(
             renderer,
             Point::from((0, 0)),
             scale,
diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs
index 612e984f..ed16a776 100644
--- a/src/layout/workspace.rs
+++ b/src/layout/workspace.rs
@@ -1348,16 +1348,6 @@ impl<W: LayoutElement> Workspace<W> {
             tile_pos.x -= offset;
         }
 
-        // FIXME: this is a bit cursed since it's relying on Tile's internal details.
-        let (starting_alpha, starting_scale) = if let Some(anim) = tile.open_animation() {
-            (
-                anim.clamped_value().clamp(0., 1.) as f32,
-                (anim.value() / 2. + 0.5).max(0.),
-            )
-        } else {
-            (1., 1.)
-        };
-
         let anim = Animation::new(1., 0., 0., self.options.animations.window_close.0);
 
         let res = ClosingWindow::new(
@@ -1367,8 +1357,6 @@ impl<W: LayoutElement> Workspace<W> {
             center,
             tile_pos,
             anim,
-            starting_alpha,
-            starting_scale,
         );
         match res {
             Ok(closing) => {
-- 
cgit