layout: Store Layout directly in Options

This commit is contained in:
Ivan Molodetskikh
2025-09-20 12:57:42 +03:00
parent 1fa9dd32ed
commit 4c524b4719
11 changed files with 279 additions and 274 deletions

View File

@@ -52,20 +52,23 @@ impl Layout {
});
let options = Options {
focus_ring: niri_config::FocusRing {
off: true,
layout: niri_config::Layout {
focus_ring: niri_config::FocusRing {
off: true,
..Default::default()
},
border: niri_config::Border {
off: false,
width: 4.,
active_color: Color::from_rgba8_unpremul(255, 163, 72, 255),
inactive_color: Color::from_rgba8_unpremul(50, 50, 50, 255),
urgent_color: Color::from_rgba8_unpremul(155, 0, 0, 255),
active_gradient: None,
inactive_gradient: None,
urgent_gradient: None,
},
..Default::default()
},
border: niri_config::Border {
off: false,
width: 4.,
active_color: Color::from_rgba8_unpremul(255, 163, 72, 255),
inactive_color: Color::from_rgba8_unpremul(50, 50, 50, 255),
urgent_color: Color::from_rgba8_unpremul(155, 0, 0, 255),
active_gradient: None,
inactive_gradient: None,
urgent_gradient: None,
},
..Default::default()
};
let mut layout = niri::layout::Layout::with_options(clock.clone(), options);

View File

@@ -58,14 +58,17 @@ impl Tile {
let Args { size, clock } = args;
let options = Options {
focus_ring: niri_config::FocusRing {
off: true,
..Default::default()
},
border: niri_config::Border {
off: false,
width: 32.,
active_color: Color::from_rgba8_unpremul(255, 163, 72, 255),
layout: niri_config::Layout {
focus_ring: niri_config::FocusRing {
off: true,
..Default::default()
},
border: niri_config::Border {
off: false,
width: 32.,
active_color: Color::from_rgba8_unpremul(255, 163, 72, 255),
..Default::default()
},
..Default::default()
},
..Default::default()