Move default_border() into FocusRing

YaLTeR · Feb 12, 2024 · 6e23073 · 6e23073
1 parent a9fcbf8
commit 6e23073
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs
@@ -281,7 +281,7 @@ pub struct Mode {
 pub struct Layout {
     #[knuffel(child, default)]
     pub focus_ring: FocusRing,
-    #[knuffel(child, default = default_border())]
+    #[knuffel(child, default = FocusRing::default_border())]
     pub border: FocusRing,
     #[knuffel(child, unwrap(children), default)]
     pub preset_column_widths: Vec<PresetWidth>,
@@ -324,12 +324,14 @@ impl Default for FocusRing {
     }
 }
 
-pub const fn default_border() -> FocusRing {
-    FocusRing {
-        off: true,
-        width: 4,
-        active_color: Color::new(255, 200, 127, 255),
-        inactive_color: Color::new(80, 80, 80, 255),
+impl FocusRing {
+    pub const fn default_border() -> FocusRing {
+        FocusRing {
+            off: true,
+            width: 4,
+            active_color: Color::new(255, 200, 127, 255),
+            inactive_color: Color::new(80, 80, 80, 255),
+        }
     }
 }
 

diff --git a/src/layout/mod.rs b/src/layout/mod.rs
@@ -168,7 +168,7 @@ impl Default for Options {
             gaps: 16,
             struts: Default::default(),
             focus_ring: Default::default(),
-            border: niri_config::default_border(),
+            border: niri_config::FocusRing::default_border(),
             center_focused_column: Default::default(),
             preset_widths: vec![
                 ColumnWidth::Proportion(1. / 3.),