summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar taiyu <taiyu.len@gmail.com>2015-08-21 10:34:37 -0700
committerLibravatar taiyu <taiyu.len@gmail.com>2015-08-21 10:34:37 -0700
commitdde8bfe72838b2a08a6367a3bc26fde528c6dafe (patch)
tree322587da331f8f2715ded2b1a9c91845243af77e
parentMerge branch 'master' of https://github.com/SirCmpwn/sway (diff)
downloadsway-dde8bfe72838b2a08a6367a3bc26fde528c6dafe.tar.gz
sway-dde8bfe72838b2a08a6367a3bc26fde528c6dafe.tar.zst
sway-dde8bfe72838b2a08a6367a3bc26fde528c6dafe.zip
check floating mod for resizing windows, and dont send click
-rw-r--r--sway/handlers.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sway/handlers.c b/sway/handlers.c
index 07247b1c..3dda3e43 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -640,8 +640,12 @@ static bool handle_pointer_button(wlc_handle view, uint32_t time, const struct w
640 // Dont want pointer sent to window while dragging or resizing 640 // Dont want pointer sent to window while dragging or resizing
641 return (pointer_state.floating.drag || pointer_state.floating.resize); 641 return (pointer_state.floating.drag || pointer_state.floating.resize);
642 } else { 642 } else {
643 pointer_state.tiling.resize = pointer_state.r_held; 643 if (modifiers->mods & config->floating_mod) {
644 pointer_state.tiling.init_view = pointer; 644 pointer_state.tiling.resize = pointer_state.r_held;
645 pointer_state.tiling.init_view = pointer;
646 // Dont want pointer sent when resizing
647 return (pointer_state.tiling.resize);
648 }
645 } 649 }
646 return (pointer && pointer != focused); 650 return (pointer && pointer != focused);
647 } else { 651 } else {