mirror/kanshi
1
0
Fork 0
mirror of https://github.com/emersion/kanshi synced 2024-11-23 00:02:16 +01:00
Code Issues Releases Activity

Add support for fractional scaling

Browse Source 
Fixes https://github.com/emersion/kanshi/issues/15
This commit is contained in:
emersion 2018-11-18 00:14:09 +01:00
parent ed21acce0c
commit 1d3f301243
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend.rs
View File

@ -41,7 +41,7 @@ impl SwayFrontend {
if saved.width > 0 && saved.height > 0 {
l += &format!(" resolution {}x{}", saved.width, saved.height);
}
if saved.scale > 0 {
if saved.scale > 0. {
l += &format!(" scale {}", saved.scale);
}
cmds.push(l);

14
src/store.rs
View File

@ -9,8 +9,6 @@ use std::path::PathBuf;
use std::str;
use std::str::FromStr;
use nom::digit;
#[derive(Debug, Default)]
pub struct SavedOutput {
pub name: String,
@ -30,7 +28,7 @@ pub struct SavedOutput {
pub primary: bool,
//pub presentation: bool,
//pub underscanning: bool,
pub scale: i32,
pub scale: f32,
}
#[derive(Debug, Default)]
@ -127,7 +125,7 @@ enum OutputArg {
Disable,
Resolution(i32, i32),
Position(i32, i32),
Scale(i32),
Scale(f32),
}
fn parse_output_with_args(name: String, args: Vec<OutputArg>) -> SavedOutput {
@ -147,7 +145,7 @@ fn parse_output_with_args(name: String, args: Vec<OutputArg>) -> SavedOutput {
o.x = x;
o.y = y;
},
OutputArg::Scale(i) => o.scale = i,
OutputArg::Scale(f) => o.scale = f,
}
}
@ -179,7 +177,7 @@ named!(parse_disable<&[u8], OutputArg>, do_parse!(tag!("disable") >> (OutputArg:
named!(parse_i32<&[u8], i32>, map_res!(
map_res!(
digit,
nom::digit,
str::from_utf8
),
i32::from_str
@ -203,10 +201,12 @@ named!(parse_position<&[u8], OutputArg>, do_parse!(
>> (OutputArg::Position(x, y))
));
named!(parse_f32<&[u8], f32>, ws!(nom::float));
named!(parse_scale<&[u8], OutputArg>, do_parse!(
tag!("scale")
>> parse_space
>> f: parse_i32
>> f: parse_f32
>> (OutputArg::Scale(f))
));