diff options
author | Luminarys <kizunanohikari@gmail.com> | 2015-08-19 11:23:27 -0500 |
---|---|---|
committer | Luminarys <kizunanohikari@gmail.com> | 2015-08-19 11:23:27 -0500 |
commit | 0b23962564a52dff8dd70488f33bc08eeb5aef03 (patch) | |
tree | eb04c6efe3f375c61db27b762945426791606d38 | |
parent | Added in resize locking (diff) | |
download | sway-0b23962564a52dff8dd70488f33bc08eeb5aef03.tar.gz sway-0b23962564a52dff8dd70488f33bc08eeb5aef03.tar.zst sway-0b23962564a52dff8dd70488f33bc08eeb5aef03.zip |
Resolved merge conflicts
-rw-r--r-- | sway/handlers.c | 8 |
1 files changed, 1 insertions, 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; | |||
26 | static bool lock_left, lock_right, lock_top, lock_bottom = false; | 26 | static bool lock_left, lock_right, lock_top, lock_bottom = false; |
27 | 27 | ||
28 | static bool floating_mod_pressed(void) { | 28 | static bool floating_mod_pressed(void) { |
29 | return true; | 29 | return key_modifiers & config->floating_mod; |
30 | int i = 0; | ||
31 | while (i < keys_pressed_length) { | ||
32 | if (keys_pressed[i++] == config->floating_mod) | ||
33 | return true; | ||
34 | } | ||
35 | return false; | ||
36 | } | 30 | } |
37 | 31 | ||
38 | static bool pointer_test(swayc_t *view, void *_origin) { | 32 | static bool pointer_test(swayc_t *view, void *_origin) { |