andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-22 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

layout: Add Column::position

Browse Source
This commit is contained in:
Ivan Molodetskikh
2023-12-26 10:29:00 +04:00
parent 4dd7578fe7
commit c048abc8b5
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/mod.rs
+2 -2
View File
@@ -518,7 +518,7 @@ impl<W: LayoutElement> Layout<W> {
for mon in monitors { for mon in monitors {
for ws in &mon.workspaces { for ws in &mon.workspaces {
for col in &ws.columns { for col in &ws.columns {
if let Some(idx) = col.windows.iter().position(|w| w == window) { if let Some(idx) = col.position(window) {
return Some(col.window_y(idx)); return Some(col.window_y(idx));
} }
} }
@@ -528,7 +528,7 @@ impl<W: LayoutElement> Layout<W> {
MonitorSet::NoOutputs { workspaces, .. } => { MonitorSet::NoOutputs { workspaces, .. } => {
for ws in workspaces { for ws in workspaces {
for col in &ws.columns { for col in &ws.columns {
if let Some(idx) = col.windows.iter().position(|w| w == window) { if let Some(idx) = col.position(window) {
return Some(col.window_y(idx)); return Some(col.window_y(idx));
} }
} }
src/layout/workspace.rs
+7 -8
View File
@@ -529,7 +529,7 @@ impl<W: LayoutElement> Workspace<W> {
.unwrap(); .unwrap();
let column = &self.columns[column_idx]; let column = &self.columns[column_idx];
let window_idx = column.windows.iter().position(|win| win == window).unwrap(); let window_idx = column.position(window).unwrap();
self.remove_window_by_idx(column_idx, window_idx); self.remove_window_by_idx(column_idx, window_idx);
} }
@@ -809,12 +809,7 @@ impl<W: LayoutElement> Workspace<W> {
.columns .columns
.iter() .iter()
.enumerate() .enumerate()
.find_map(|(col_idx, col)| { .find_map(|(col_idx, col)| col.position(window).map(|win_idx| (col_idx, win_idx)))
col.windows
.iter()
.position(|w| w == window)
.map(|win_idx| (col_idx, win_idx))
})
.unwrap(); .unwrap();
let mut col = &mut self.columns[col_idx]; let mut col = &mut self.columns[col_idx];
@@ -1027,8 +1022,12 @@ impl<W: LayoutElement> Column<W> {
self.windows.iter().any(|win| win == window) self.windows.iter().any(|win| win == window)
} }
pub fn position(&self, window: &W) -> Option<usize> {
self.windows.iter().position(|win| win == window)
}
fn activate_window(&mut self, window: &W) { fn activate_window(&mut self, window: &W) {
let idx = self.windows.iter().position(|win| win == window).unwrap(); let idx = self.position(window).unwrap();
self.active_window_idx = idx; self.active_window_idx = idx;
} }