mirror of
https://github.com/swaywm/sway.git
synced 2024-12-29 00:16:22 +01:00
Resolved merge conflicts
This commit is contained in:
parent
dd8ff4a150
commit
0b23962564
1 changed files with 1 additions and 7 deletions
|
@ -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) {
|
||||||
|
|
Loading…
Reference in a new issue