diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2025-09-20 12:57:42 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2025-10-02 09:33:08 +0300 |
| commit | 4c524b47196badd281bc159bef3137cf16f963e5 (patch) | |
| tree | 3284ab9c888e5883a525dbf04ad32818cc1c7f81 /niri-visual-tests/src/cases | |
| parent | 1fa9dd32ed028c88248644a13421c098fef72894 (diff) | |
| download | niri-4c524b47196badd281bc159bef3137cf16f963e5.tar.gz niri-4c524b47196badd281bc159bef3137cf16f963e5.tar.bz2 niri-4c524b47196badd281bc159bef3137cf16f963e5.zip | |
layout: Store Layout directly in Options
Diffstat (limited to 'niri-visual-tests/src/cases')
| -rw-r--r-- | niri-visual-tests/src/cases/layout.rs | 27 | ||||
| -rw-r--r-- | niri-visual-tests/src/cases/tile.rs | 19 |
2 files changed, 26 insertions, 20 deletions
diff --git a/niri-visual-tests/src/cases/layout.rs b/niri-visual-tests/src/cases/layout.rs index 50a27ae7..d6175efe 100644 --- a/niri-visual-tests/src/cases/layout.rs +++ b/niri-visual-tests/src/cases/layout.rs @@ -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); diff --git a/niri-visual-tests/src/cases/tile.rs b/niri-visual-tests/src/cases/tile.rs index 1823fe99..23edc4f2 100644 --- a/niri-visual-tests/src/cases/tile.rs +++ b/niri-visual-tests/src/cases/tile.rs @@ -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() |