diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2024-05-05 12:55:57 +0400 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-05-05 12:55:57 +0400 |
| commit | 96823eea38fc4690a5f2eb37050ce001a7292d6e (patch) | |
| tree | d8ff85ce011fe1e52c8badfe5383a9004d6c5fca /src/niri.rs | |
| parent | ea590918696709b0586eb1941b4829ffc5a46e94 (diff) | |
| download | niri-96823eea38fc4690a5f2eb37050ce001a7292d6e.tar.gz niri-96823eea38fc4690a5f2eb37050ce001a7292d6e.tar.bz2 niri-96823eea38fc4690a5f2eb37050ce001a7292d6e.zip | |
Make output name matching case-insensitive
Diffstat (limited to 'src/niri.rs')
| -rw-r--r-- | src/niri.rs | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/niri.rs b/src/niri.rs index aee3650b..7d90baae 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -1012,7 +1012,10 @@ impl State { for output in self.niri.global_space.outputs() { let name = output.name(); let config = self.niri.config.borrow_mut(); - let config = config.outputs.iter().find(|o| o.name == name); + let config = config + .outputs + .iter() + .find(|o| o.name.eq_ignore_ascii_case(&name)); let scale = config.and_then(|c| c.scale).unwrap_or_else(|| { let size_mm = output.physical_properties().size; @@ -1058,7 +1061,11 @@ impl State { pub fn apply_transient_output_config(&mut self, name: &str, action: niri_ipc::OutputAction) { { let mut config = self.niri.config.borrow_mut(); - let config = if let Some(config) = config.outputs.iter_mut().find(|o| o.name == name) { + let config = if let Some(config) = config + .outputs + .iter_mut() + .find(|o| o.name.eq_ignore_ascii_case(name)) + { config } else { config.outputs.push(niri_config::Output { @@ -1564,7 +1571,7 @@ impl Niri { let config = config .outputs .iter() - .find(|o| o.name == name) + .find(|o| o.name.eq_ignore_ascii_case(&name)) .and_then(|c| c.position); outputs.push(Data { @@ -1670,7 +1677,10 @@ impl Niri { let name = output.name(); let config = self.config.borrow(); - let c = config.outputs.iter().find(|o| o.name == name); + let c = config + .outputs + .iter() + .find(|o| o.name.eq_ignore_ascii_case(&name)); let scale = c.and_then(|c| c.scale).unwrap_or_else(|| { let size_mm = output.physical_properties().size; let resolution = output.current_mode().unwrap().size; |
