diff options
| author |  Ezra <luminarys@fuwa.se> | 2015-08-19 11:29:32 -0500 |
|---|---|---|
| committer | Ezra <luminarys@fuwa.se> | 2015-08-19 11:29:32 -0500 |
| commit | 745031e6f97b871de0c37572b085aea4eae855a8 (patch) | |
| tree | 61b4a671c9f1a789969d106aa7eab1f70dbe4fc1 | |
| parent | Resolved merge conflicts (diff) | |
| download | sway-745031e6f97b871de0c37572b085aea4eae855a8.tar.gz sway-745031e6f97b871de0c37572b085aea4eae855a8.tar.zst sway-745031e6f97b871de0c37572b085aea4eae855a8.zip | |
More merge resolution.
| -rw-r--r-- | sway/handlers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/handlers.c b/sway/handlers.c index 92d9b6af..00f10a0c 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
| @@ -26,7 +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 key_modifiers & config->floating_mod; | 29 | return key_modifiers & config->floating_mod; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | static bool pointer_test(swayc_t *view, void *_origin) { | 32 | static bool pointer_test(swayc_t *view, void *_origin) { |