mirror of
https://github.com/niri-wm/niri.git
synced 2026-06-22 02:01:55 +07:00
tests: Rename DefaultWidth to DefaultSize
This commit is contained in:
+12
-12
@@ -133,18 +133,18 @@ impl fmt::Display for SetParent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy)]
|
#[derive(Clone, Copy)]
|
||||||
enum DefaultWidth {
|
enum DefaultSize {
|
||||||
WindowChooses,
|
WindowChooses,
|
||||||
Proportion(&'static str),
|
Proportion(&'static str),
|
||||||
Fixed(&'static str),
|
Fixed(&'static str),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl fmt::Display for DefaultWidth {
|
impl fmt::Display for DefaultSize {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
match self {
|
match self {
|
||||||
DefaultWidth::WindowChooses => write!(f, "U"),
|
DefaultSize::WindowChooses => write!(f, "U"),
|
||||||
DefaultWidth::Proportion(prop) => write!(f, "P{prop}"),
|
DefaultSize::Proportion(prop) => write!(f, "P{prop}"),
|
||||||
DefaultWidth::Fixed(fixed) => write!(f, "F{fixed}"),
|
DefaultSize::Fixed(fixed) => write!(f, "F{fixed}"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -397,9 +397,9 @@ fn target_size() {
|
|||||||
let open_floating = [None, Some("true")];
|
let open_floating = [None, Some("true")];
|
||||||
let default_column_width = [
|
let default_column_width = [
|
||||||
None,
|
None,
|
||||||
Some(DefaultWidth::WindowChooses),
|
Some(DefaultSize::WindowChooses),
|
||||||
Some(DefaultWidth::Proportion("0.25")),
|
Some(DefaultSize::Proportion("0.25")),
|
||||||
Some(DefaultWidth::Fixed("1000")),
|
Some(DefaultSize::Fixed("1000")),
|
||||||
];
|
];
|
||||||
let border = [false, true];
|
let border = [false, true];
|
||||||
|
|
||||||
@@ -430,7 +430,7 @@ fn check_target_size(
|
|||||||
want_fullscreen: WantFullscreen,
|
want_fullscreen: WantFullscreen,
|
||||||
open_maximized: Option<&str>,
|
open_maximized: Option<&str>,
|
||||||
open_floating: Option<&str>,
|
open_floating: Option<&str>,
|
||||||
default_width: Option<DefaultWidth>,
|
default_width: Option<DefaultSize>,
|
||||||
border: bool,
|
border: bool,
|
||||||
) {
|
) {
|
||||||
let mut snapshot_desc = Vec::new();
|
let mut snapshot_desc = Vec::new();
|
||||||
@@ -465,9 +465,9 @@ window-rule {
|
|||||||
|
|
||||||
if let Some(x) = default_width {
|
if let Some(x) = default_width {
|
||||||
let value = match x {
|
let value = match x {
|
||||||
DefaultWidth::WindowChooses => String::new(),
|
DefaultSize::WindowChooses => String::new(),
|
||||||
DefaultWidth::Proportion(prop) => format!("proportion {prop};"),
|
DefaultSize::Proportion(prop) => format!("proportion {prop};"),
|
||||||
DefaultWidth::Fixed(fixed) => format!("fixed {fixed};"),
|
DefaultSize::Fixed(fixed) => format!("fixed {fixed};"),
|
||||||
};
|
};
|
||||||
writeln!(config, " default-column-width {{ {value} }}").unwrap();
|
writeln!(config, " default-column-width {{ {value} }}").unwrap();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user