aboutsummaryrefslogtreecommitdiff
path: root/niri-config/src
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2024-05-05 12:39:20 +0400
committerIvan Molodetskikh <yalterz@gmail.com>2024-05-05 12:39:20 +0400
commit2e4a2e13b175fcbb0fef58214f7de5b60775214a (patch)
treea3e71dbe9986919a012e003be0d563d109e68505 /niri-config/src
parentdf0ee996ee0c70d4fb0fb853535e1563da3c0d09 (diff)
downloadniri-2e4a2e13b175fcbb0fef58214f7de5b60775214a.tar.gz
niri-2e4a2e13b175fcbb0fef58214f7de5b60775214a.tar.bz2
niri-2e4a2e13b175fcbb0fef58214f7de5b60775214a.zip
Make missing scale = automatic selection
That was the intention, but I missed it before.
Diffstat (limited to 'niri-config/src')
-rw-r--r--niri-config/src/lib.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs
index 4aa1edad..d9ef55d1 100644
--- a/niri-config/src/lib.rs
+++ b/niri-config/src/lib.rs
@@ -243,8 +243,8 @@ pub struct Output {
pub off: bool,
#[knuffel(argument)]
pub name: String,
- #[knuffel(child, unwrap(argument), default = 1.)]
- pub scale: f64,
+ #[knuffel(child, unwrap(argument))]
+ pub scale: Option<f64>,
#[knuffel(child, unwrap(argument, str), default = Transform::Normal)]
pub transform: Transform,
#[knuffel(child)]
@@ -260,7 +260,7 @@ impl Default for Output {
Self {
off: false,
name: String::new(),
- scale: 1.,
+ scale: None,
transform: Transform::Normal,
position: None,
mode: None,
@@ -2291,7 +2291,7 @@ mod tests {
outputs: vec![Output {
off: false,
name: "eDP-1".to_owned(),
- scale: 2.,
+ scale: Some(2.),
transform: Transform::Flipped90,
position: Some(Position { x: 10, y: 20 }),
mode: Some(ConfiguredMode {