From 0b23962564a52dff8dd70488f33bc08eeb5aef03 Mon Sep 17 00:00:00 2001 From: Luminarys Date: Wed, 19 Aug 2015 11:23:27 -0500 Subject: [PATCH] Resolved merge conflicts --- sway/handlers.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sway/handlers.c b/sway/handlers.c index 306c8abf..92d9b6af 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -26,13 +26,7 @@ static bool resizing = false; static bool lock_left, lock_right, lock_top, lock_bottom = false; static bool floating_mod_pressed(void) { - return true; - int i = 0; - while (i < keys_pressed_length) { - if (keys_pressed[i++] == config->floating_mod) - return true; - } - return false; + return key_modifiers & config->floating_mod; } static bool pointer_test(swayc_t *view, void *_origin) {