feat: set keyboard layout system-wide when setting it in preferences

This commit is contained in:
Gianguido Sorà 2022-11-02 18:20:45 +01:00
parent e6cb3979f1
commit 2436d6978c

View file

@ -57,6 +57,7 @@ struct DevicePrefs {
up: Manager, up: Manager,
modals: modals::Modals, modals: modals::Modals,
gam: gam::Gam, gam: gam::Gam,
kbd: keyboard::Keyboard,
} }
impl PrefHandler for DevicePrefs { impl PrefHandler for DevicePrefs {
@ -105,6 +106,7 @@ impl DevicePrefs {
up: Manager::new(), up: Manager::new(),
modals: modals::Modals::new(&xns).unwrap(), modals: modals::Modals::new(&xns).unwrap(),
gam: gam::Gam::new(&xns).unwrap(), gam: gam::Gam::new(&xns).unwrap(),
kbd: keyboard::Keyboard::new(&xns).unwrap(),
} }
} }
@ -254,7 +256,11 @@ impl DevicePrefs {
let new_result = mappings[new_result.as_str()]; let new_result = mappings[new_result.as_str()];
Ok(self.up.set_keyboard_layout(new_result)?) self.up.set_keyboard_layout(new_result)?;
self.kbd.set_keymap(keyboard::KeyMap::from(new_result)).unwrap();
Ok(())
} }
} }