From 8018839f5d970b0960936a4d7d984a8599785988 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Wed, 28 Feb 2024 17:23:03 +0400
Subject: Extract animate_view_offset_to_column()

---
 src/layout/workspace.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/layout')

diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs
index 8558dd89..fce5719d 100644
--- a/src/layout/workspace.rs
+++ b/src/layout/workspace.rs
@@ -459,12 +459,7 @@ impl<W: LayoutElement> Workspace<W> {
         self.animate_view_offset(current_x, idx, new_view_offset);
     }
 
-    fn activate_column(&mut self, idx: usize) {
-        if self.active_column_idx == idx {
-            return;
-        }
-
-        let current_x = self.view_pos();
+    fn animate_view_offset_to_column(&mut self, current_x: i32, idx: usize) {
         match self.options.center_focused_column {
             CenterFocusedColumn::Always => {
                 self.animate_view_offset_to_column_centered(current_x, idx)
@@ -500,6 +495,15 @@ impl<W: LayoutElement> Workspace<W> {
             }
             CenterFocusedColumn::Never => self.animate_view_offset_to_column_fit(current_x, idx),
         };
+    }
+
+    fn activate_column(&mut self, idx: usize) {
+        if self.active_column_idx == idx {
+            return;
+        }
+
+        let current_x = self.view_pos();
+        self.animate_view_offset_to_column(current_x, idx);
 
         self.active_column_idx = idx;
 
-- 
cgit