aboutsummaryrefslogtreecommitdiff
path: root/src/window
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2024-11-30 09:18:33 +0300
committerIvan Molodetskikh <yalterz@gmail.com>2024-12-01 22:24:21 -0800
commit8665003269d1fbe4efe3c477a71400392930cac9 (patch)
treec8c7bc727032c51259e4bdbd6e1541c859cc6e0f /src/window
parent1e76716819ecda33dca0e612d62a8f6c2892890d (diff)
downloadniri-8665003269d1fbe4efe3c477a71400392930cac9.tar.gz
niri-8665003269d1fbe4efe3c477a71400392930cac9.tar.bz2
niri-8665003269d1fbe4efe3c477a71400392930cac9.zip
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().
Diffstat (limited to 'src/window')
-rw-r--r--src/window/mod.rs2
-rw-r--r--src/window/unmapped.rs2
2 files changed, 2 insertions, 2 deletions
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 {