Merge branch 'fix-dragging-fullscreen'

This commit is contained in:
Michael Stapelberg 2011-09-22 23:11:11 +01:00
commit 30dea1fda6
1 changed files with 5 additions and 2 deletions

View File

@ -178,8 +178,11 @@ static int route_click(Con *con, xcb_button_press_event_t *event, bool mod_press
/* 2: focus this con */ /* 2: focus this con */
con_focus(con); con_focus(con);
/* 3: for floating containers, we also want to raise them on click */ /* 3: For floating containers, we also want to raise them on click.
if (floatingcon != NULL) { * We will skip handling events on floating cons in fullscreen mode */
Con *ws = con_get_workspace(con);
Con *fs = (ws ? con_get_fullscreen_con(ws, CF_OUTPUT) : NULL);
if (floatingcon != NULL && fs == NULL) {
floating_raise_con(floatingcon); floating_raise_con(floatingcon);
/* 4: floating_modifier plus left mouse button drags */ /* 4: floating_modifier plus left mouse button drags */