forked from enlightenment/enlightenment
parent
98a3c6d2fc
commit
99fc29f7aa
|
@ -984,6 +984,7 @@ ACT_FN_GO(window_desk_move_by)
|
||||||
e_zone_desk_flip_by(bd->zone, to_x - dx, to_y - dy);
|
e_zone_desk_flip_by(bd->zone, to_x - dx, to_y - dy);
|
||||||
/* send the border to the required desktop. */
|
/* send the border to the required desktop. */
|
||||||
e_border_desk_set(bd, desk);
|
e_border_desk_set(bd, desk);
|
||||||
|
if (!bd->lock_focus_out)
|
||||||
e_border_focus_set(bd, 1, 1);
|
e_border_focus_set(bd, 1, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1371,6 +1371,7 @@ e_border_focus_set_with_pointer(E_Border *bd)
|
||||||
// printf(" 2accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
|
// printf(" 2accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
|
||||||
if ((!bd->client.icccm.accepts_focus) &&
|
if ((!bd->client.icccm.accepts_focus) &&
|
||||||
(!bd->client.icccm.take_focus)) return;
|
(!bd->client.icccm.take_focus)) return;
|
||||||
|
if (bd->lock_focus_out) return;
|
||||||
|
|
||||||
/* Try to grab the pointer to make sure it's not "in use" */
|
/* Try to grab the pointer to make sure it's not "in use" */
|
||||||
if (!ecore_x_pointer_grab(bd->zone->container->win))
|
if (!ecore_x_pointer_grab(bd->zone->container->win))
|
||||||
|
@ -1412,6 +1413,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
|
||||||
if ((!bd->client.icccm.accepts_focus) &&
|
if ((!bd->client.icccm.accepts_focus) &&
|
||||||
(!bd->client.icccm.take_focus))
|
(!bd->client.icccm.take_focus))
|
||||||
return;
|
return;
|
||||||
|
if ((set) && (focus) && (bd->lock_focus_out)) return;
|
||||||
/* dont focus an iconified window. that's silly! */
|
/* dont focus an iconified window. that's silly! */
|
||||||
if ((focus) && (bd->iconic))
|
if ((focus) && (bd->iconic))
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -367,6 +367,7 @@ e_desk_last_focused_focus(E_Desk *desk)
|
||||||
if ((!bd->iconic) && (bd->visible) && (bd->desk == desk))
|
if ((!bd->iconic) && (bd->visible) && (bd->desk == desk))
|
||||||
{
|
{
|
||||||
/* this was the window last focused in this desktop */
|
/* this was the window last focused in this desktop */
|
||||||
|
if (!bd->lock_focus_out)
|
||||||
e_border_focus_set(bd, 1, 1);
|
e_border_focus_set(bd, 1, 1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1461,6 +1461,7 @@ _e_int_menus_lost_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
e_border_move(bd, bd->zone->x + ((bd->zone->w - bd->w) / 2),
|
e_border_move(bd, bd->zone->x + ((bd->zone->w - bd->w) / 2),
|
||||||
bd->zone->y + ((bd->zone->h - bd->h) / 2));
|
bd->zone->y + ((bd->zone->h - bd->h) / 2));
|
||||||
e_border_raise(bd);
|
e_border_raise(bd);
|
||||||
|
if (!bd->lock_focus_out)
|
||||||
e_border_focus_set(bd, 1, 1);
|
e_border_focus_set(bd, 1, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue