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

fix(shortcuts): disable default keybind when modified

Browse source
This commit is contained in:
19MisterX98 2025-04-23 22:07:08 +02:00 • committed by GitHub
parent f16244b400
commit bc70106fe5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cosmic-settings/src/pages/input/keyboard/shortcuts/common.rs
View file

@ -11,7 +11,7 @@ use cosmic_settings_page as page;
use slab::Slab; use slab::Slab;
use slotmap::Key; use slotmap::Key;
use std::borrow::Cow; use std::borrow::Cow;
use std::io; use std::{io, mem};
use std::str::FromStr; use std::str::FromStr;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@ -534,9 +534,8 @@ impl Model {
if let Some(new_binding) = apply_binding { if let Some(new_binding) = apply_binding {
if let Some(model) = self.shortcut_models.get_mut(short_id) { if let Some(model) = self.shortcut_models.get_mut(short_id) {
if let Some(shortcut) = model.bindings.get_mut(id) { if let Some(shortcut) = model.bindings.get_mut(id) {
let prev_binding = shortcut.binding.clone(); let prev_binding = mem::replace(&mut shortcut.binding, new_binding.clone());
shortcut.binding = new_binding.clone();
shortcut.is_saved = true; shortcut.is_saved = true;
shortcut.input.clear(); shortcut.input.clear();
@ -545,7 +544,12 @@ impl Model {
} }
let action = model.action.clone(); let action = model.action.clone();
self.config_remove(&prev_binding);
if shortcut.is_default {
self.config_add(Action::Disable, prev_binding);
} else {
self.config_remove(&prev_binding);
}
self.config_add(action, new_binding); self.config_add(action, new_binding);
return cosmic::widget::text_input::focus( return cosmic::widget::text_input::focus(
self.add_keybindings_button_id.clone(), self.add_keybindings_button_id.clone(),