From 8665003269d1fbe4efe3c477a71400392930cac9 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sat, 30 Nov 2024 09:18:33 +0300
Subject: layout: Extract ScrollingSpace

Leave the Workspace to do the workspace parts, and extract the scrolling parts
into a new file. This is a pre-requisite for things like the floating layer
(which will live in a workspace alongside the scrolling layer).

As part of this huge refactor, I found and fixed at least these issues:
- Wrong horizontal popup unconstraining for a smaller window in an
  always-centered column.
- Wrong workspace switch in focus_up_or_right().
---
 src/window/mod.rs      | 2 +-
 src/window/unmapped.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/window')

diff --git a/src/window/mod.rs b/src/window/mod.rs
index 7c77a2a7..45c1d125 100644
--- a/src/window/mod.rs
+++ b/src/window/mod.rs
@@ -2,7 +2,7 @@ use niri_config::{BlockOutFrom, BorderRule, CornerRadius, Match, WindowRule};
 use smithay::reexports::wayland_protocols::xdg::shell::server::xdg_toplevel;
 use smithay::wayland::shell::xdg::{ToplevelSurface, XdgToplevelSurfaceRoleAttributes};
 
-use crate::layout::workspace::ColumnWidth;
+use crate::layout::scrolling::ColumnWidth;
 use crate::utils::with_toplevel_role;
 
 pub mod mapped;
diff --git a/src/window/unmapped.rs b/src/window/unmapped.rs
index 98f57aad..2eeae5d4 100644
--- a/src/window/unmapped.rs
+++ b/src/window/unmapped.rs
@@ -4,7 +4,7 @@ use smithay::wayland::shell::xdg::ToplevelSurface;
 use smithay::wayland::xdg_activation::XdgActivationTokenData;
 
 use super::ResolvedWindowRules;
-use crate::layout::workspace::ColumnWidth;
+use crate::layout::scrolling::ColumnWidth;
 
 #[derive(Debug)]
 pub struct Unmapped {
-- 
cgit