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

Merge branch 'master' into jellywx/fix-pageup-pagedown-binds

Browse source
This commit is contained in:
Levi Portenier 2026-05-14 14:32:25 -06:00 • committed by GitHub
commit 77114d0320
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
39 changed files with 1917 additions and 1609 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/shortcuts.rs
View file

@ -2,8 +2,8 @@
use cosmic::widget::menu::key_bind::{KeyBind, Modifier};
use cosmic::{
iced::core::keyboard::key::Named,
iced::keyboard::{Key, Modifiers},
iced_core::keyboard::key::Named,
};
use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, HashMap};
@ -245,11 +245,11 @@ impl ShortcutsConfig {
// Remove any matching bindings
return false;
}
if let Some(default_action) = self.defaults.0.get(binding) {
if *default_action == reset_action {
// Remove binding that overrode a default
return false;
}
if let Some(default_action) = self.defaults.0.get(binding)
&& *default_action == reset_action
{
// Remove binding that overrode a default
return false;
}
true
});