From 6e5426ef225f5720a97cf7e2def25132bfc2cf0c Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Fri, 1 Mar 2024 08:09:03 +0400
Subject: Fix center-column regression

Mistake introduced along with the horizontal gesture.
---
 src/layout/workspace.rs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/layout')

diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs
index 34867755..c0b04896 100644
--- a/src/layout/workspace.rs
+++ b/src/layout/workspace.rs
@@ -171,15 +171,6 @@ impl OutputId {
     }
 }
 
-impl ViewOffsetAdjustment {
-    pub fn current_view_offset(&self) -> f64 {
-        match self {
-            ViewOffsetAdjustment::Animation(anim) => anim.value(),
-            ViewOffsetAdjustment::Gesture(gesture) => gesture.current_view_offset,
-        }
-    }
-}
-
 impl ColumnWidth {
     fn resolve(self, options: &Options, view_width: i32) -> i32 {
         match self {
@@ -401,8 +392,8 @@ impl<W: LayoutElement> Workspace<W> {
 
         let new_col_x = self.column_x(idx);
 
-        let final_x = if let Some(adj) = &self.view_offset_adj {
-            current_x - self.view_offset + adj.current_view_offset().round() as i32
+        let final_x = if let Some(ViewOffsetAdjustment::Animation(anim)) = &self.view_offset_adj {
+            current_x - self.view_offset + anim.to().round() as i32
         } else {
             current_x
         };
-- 
cgit