Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-12-17 13:55:45 +00:00
commit 5a345db18b

View File

@ -254,7 +254,7 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod
} }
/* 7: floating modifier pressed, initiate a resize */ /* 7: floating modifier pressed, initiate a resize */
if (mod_pressed && event->detail == 3) { if (dest == CLICK_INSIDE && mod_pressed && event->detail == 3) {
if (floating_mod_on_tiled_client(con, event)) if (floating_mod_on_tiled_client(con, event))
return 1; return 1;
} }