leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #115 from pop-os/cosmic-config_jammy

Browse source 
Use `_` in names of cosmic-config settings
This commit is contained in:
Ian Douglas Scott 2023-12-21 09:05:19 -08:00 • committed by GitHub
commit e534f7b151
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/pages/input/mod.rs
View file

@ -64,9 +64,9 @@ fn get_config<T: Default + serde::de::DeserializeOwned>(
impl Default for Page {
fn default() -> Self {
let config = cosmic_config::Config::new("com.system76.CosmicComp", 1).unwrap();
let input_default: InputConfig = get_config(&config, "input-default");
let input_touchpad: InputConfig = get_config(&config, "input-touchpad");
let xkb = get_config(&config, "xkb-config");
let input_default: InputConfig = get_config(&config, "input_default");
let input_touchpad: InputConfig = get_config(&config, "input_touchpad");
let xkb = get_config(&config, "xkb_config");
let mut primary_button = mouse::default_primary_button();
let idx = if input_default.left_handed.unwrap_or(false) {
@ -107,9 +107,9 @@ impl Default for Page {
impl Page {
fn update_input<F: Fn(&mut InputConfig)>(&mut self, touchpad: bool, f: F) {
let (name, input_config) = if touchpad {
("input-touchpad", &mut self.input_touchpad)
("input_touchpad", &mut self.input_touchpad)
} else {
("input-default", &mut self.input_default)
("input_default", &mut self.input_default)
};
f(input_config);
if let Err(err) = self.config.set(name, input_config) {
@ -194,8 +194,8 @@ impl Page {
.chain(id.into_iter())
.join(",");
self.xkb.options = Some(new_options).filter(|x| !x.is_empty());
if let Err(err) = self.config.set("xkb-config", &self.xkb) {
error!(?err, "Failed to set config 'xkb-config'");
if let Err(err) = self.config.set("xkb_config", &self.xkb) {
error!(?err, "Failed to set config 'xkb_config'");
}
}
}