mirror of
https://github.com/swaywm/sway.git
synced 2025-10-08 13:16:05 +00:00
Merge 2b5d8a0978
into 90d3270970
This commit is contained in:
commit
6f8950b122
2 changed files with 2 additions and 2 deletions
|
@ -165,7 +165,7 @@ static void get_active_binding(const struct sway_shortcut_state *state,
|
|||
bool binding_inhibited = (binding->flags & BINDING_INHIBITED) != 0;
|
||||
bool binding_release = binding->flags & BINDING_RELEASE;
|
||||
|
||||
if (modifiers ^ binding->modifiers ||
|
||||
if ((modifiers ^ binding->modifiers && !release) ||
|
||||
release != binding_release ||
|
||||
locked > binding_locked ||
|
||||
inhibited > binding_inhibited ||
|
||||
|
|
|
@ -133,7 +133,7 @@ static struct sway_binding* get_active_mouse_binding(
|
|||
struct sway_binding *current = NULL;
|
||||
for (int i = 0; i < bindings->length; ++i) {
|
||||
struct sway_binding *binding = bindings->items[i];
|
||||
if (modifiers ^ binding->modifiers ||
|
||||
if ((modifiers ^ binding->modifiers && !release) ||
|
||||
e->pressed_button_count != (size_t)binding->keys->length ||
|
||||
release != (binding->flags & BINDING_RELEASE) ||
|
||||
!(click_region & binding->flags) ||
|
||||
|
|
Loading…
Add table
Reference in a new issue