Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflicts

Browse source
This commit is contained in:
Junkui Zhang 2025-08-20 18:06:38 +08:00
parent 366b5d13b0
commit 029fa40109
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/settings_ui/src/keybindings.rs
View file

@ -605,16 +605,15 @@ impl KeymapEditor {
{
let query = &keystroke_query[query_cursor];
let keystroke = &keystrokes[keystroke_cursor];
let matches =
query.inner.modifiers.is_subset_of(&keystroke.inner.modifiers)
&& ((query.inner.key.is_empty()
|| query.inner.key == keystroke.inner.key)
&& query.inner
.key_char
.as_ref()
.is_none_or(|q_kc| {
q_kc == &keystroke.inner.key
});
let matches = query
.inner
.modifiers
.is_subset_of(&keystroke.inner.modifiers)
&& ((query.inner.key.is_empty()
|| query.inner.key == keystroke.inner.key)
&& query.inner.key_char.as_ref().is_none_or(
|q_kc| q_kc == &keystroke.inner.key,
));
if matches {
found_count += 1;
query_cursor += 1;