From 90f24da6317dea022fff89d538c9ba21a580e97b Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Thu, 6 Feb 2025 08:42:09 +0300
Subject: Move ColumnDisplay to niri-ipc

---
 src/layout/mod.rs       | 6 +++---
 src/layout/scrolling.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/layout')

diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index 54485617..d9121c07 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -39,10 +39,10 @@ use std::time::Duration;
 
 use monitor::MonitorAddWindowTarget;
 use niri_config::{
-    CenterFocusedColumn, ColumnDisplay, Config, CornerRadius, FloatOrInt, PresetSize, Struts,
+    CenterFocusedColumn, Config, CornerRadius, FloatOrInt, PresetSize, Struts,
     Workspace as WorkspaceConfig, WorkspaceReference,
 };
-use niri_ipc::{PositionChange, SizeChange};
+use niri_ipc::{ColumnDisplay, PositionChange, SizeChange};
 use scrolling::{Column, ColumnWidth, InsertHint, InsertPosition};
 use smithay::backend::renderer::element::surface::WaylandSurfaceRenderElement;
 use smithay::backend::renderer::element::Id;
@@ -341,7 +341,7 @@ impl Default for Options {
             center_focused_column: Default::default(),
             always_center_single_column: false,
             empty_workspace_above_first: false,
-            default_column_display: Default::default(),
+            default_column_display: ColumnDisplay::Normal,
             preset_column_widths: vec![
                 PresetSize::Proportion(1. / 3.),
                 PresetSize::Proportion(0.5),
diff --git a/src/layout/scrolling.rs b/src/layout/scrolling.rs
index 9a5e081f..b7e240c2 100644
--- a/src/layout/scrolling.rs
+++ b/src/layout/scrolling.rs
@@ -3,8 +3,8 @@ use std::iter::{self, zip};
 use std::rc::Rc;
 use std::time::Duration;
 
-use niri_config::{CenterFocusedColumn, ColumnDisplay, CornerRadius, PresetSize, Struts};
-use niri_ipc::SizeChange;
+use niri_config::{CenterFocusedColumn, CornerRadius, PresetSize, Struts};
+use niri_ipc::{ColumnDisplay, SizeChange};
 use ordered_float::NotNan;
 use smithay::backend::renderer::gles::GlesRenderer;
 use smithay::utils::{Logical, Point, Rectangle, Scale, Serial, Size};
-- 
cgit