mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolved merge conflicts

Browse source
This commit is contained in:
Luminarys 2015-08-19 11:23:27 -05:00
parent dd8ff4a150
commit 0b23962564
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sway/handlers.c
View file

@ -26,13 +26,7 @@ static bool resizing = false;
static bool lock_left, lock_right, lock_top, lock_bottom = false; static bool lock_left, lock_right, lock_top, lock_bottom = false;
static bool floating_mod_pressed(void) { static bool floating_mod_pressed(void) {
return true; return key_modifiers & config->floating_mod;
int i = 0;
while (i < keys_pressed_length) {
if (keys_pressed[i++] == config->floating_mod)
return true;
}
return false;
} }
static bool pointer_test(swayc_t *view, void *_origin) { static bool pointer_test(swayc_t *view, void *_origin) {