forked from enlightenment/enlightenment
- Make sure move object disappears if a window dies while moving.
- Show move object if moving with alt+click SVN revision: 14133
This commit is contained in:
parent
a1ea5be1f4
commit
3148036230
|
@ -111,6 +111,7 @@ static E_Border *resize = NULL;
|
||||||
static Ecore_Evas *resize_ee = NULL;
|
static Ecore_Evas *resize_ee = NULL;
|
||||||
static Evas_Object *resize_obj = NULL;
|
static Evas_Object *resize_obj = NULL;
|
||||||
|
|
||||||
|
static E_Border *move = NULL;
|
||||||
static Ecore_Evas *move_ee = NULL;
|
static Ecore_Evas *move_ee = NULL;
|
||||||
static Evas_Object *move_obj = NULL;
|
static Evas_Object *move_obj = NULL;
|
||||||
|
|
||||||
|
@ -1118,6 +1119,8 @@ _e_border_free(E_Border *bd)
|
||||||
|
|
||||||
if (resize == bd)
|
if (resize == bd)
|
||||||
_e_border_resize_end(bd);
|
_e_border_resize_end(bd);
|
||||||
|
if (move == bd)
|
||||||
|
_e_border_resize_end(bd);
|
||||||
|
|
||||||
while (bd->pending_move_resize)
|
while (bd->pending_move_resize)
|
||||||
{
|
{
|
||||||
|
@ -2063,6 +2066,7 @@ _e_border_cb_mouse_down(void *data, int type, void *event)
|
||||||
bd->moving = 1;
|
bd->moving = 1;
|
||||||
_e_border_moveinfo_gather(bd, source);
|
_e_border_moveinfo_gather(bd, source);
|
||||||
e_border_raise(bd);
|
e_border_raise(bd);
|
||||||
|
_e_border_move_begin(bd);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case E_BINDING_ACTION_RESIZE:
|
case E_BINDING_ACTION_RESIZE:
|
||||||
|
@ -2166,7 +2170,10 @@ _e_border_cb_mouse_up(void *data, int type, void *event)
|
||||||
{
|
{
|
||||||
case E_BINDING_ACTION_MOVE:
|
case E_BINDING_ACTION_MOVE:
|
||||||
if (bd->moving)
|
if (bd->moving)
|
||||||
bd->moving = 0;
|
{
|
||||||
|
bd->moving = 0;
|
||||||
|
_e_border_move_end(bd);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case E_BINDING_ACTION_RESIZE:
|
case E_BINDING_ACTION_RESIZE:
|
||||||
if (bd->resize_mode != RESIZE_NONE)
|
if (bd->resize_mode != RESIZE_NONE)
|
||||||
|
@ -3610,7 +3617,7 @@ _e_border_move_begin(E_Border *bd)
|
||||||
|
|
||||||
if (move_ee) ecore_evas_free(move_ee);
|
if (move_ee) ecore_evas_free(move_ee);
|
||||||
move_ee = ecore_evas_software_x11_new(NULL, bd->zone->container->manager->win,
|
move_ee = ecore_evas_software_x11_new(NULL, bd->zone->container->manager->win,
|
||||||
0, 0, 10, 10);
|
0, 0, 10, 10);
|
||||||
ecore_evas_override_set(move_ee, 1);
|
ecore_evas_override_set(move_ee, 1);
|
||||||
ecore_evas_software_x11_direct_resize_set(move_ee, 1);
|
ecore_evas_software_x11_direct_resize_set(move_ee, 1);
|
||||||
e_canvas_add(move_ee);
|
e_canvas_add(move_ee);
|
||||||
|
@ -3636,6 +3643,7 @@ _e_border_move_begin(E_Border *bd)
|
||||||
ecore_evas_resize(move_ee, w, h);
|
ecore_evas_resize(move_ee, w, h);
|
||||||
|
|
||||||
ecore_evas_show(move_ee);
|
ecore_evas_show(move_ee);
|
||||||
|
move = bd;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -3647,6 +3655,7 @@ _e_border_move_end(E_Border *bd)
|
||||||
ecore_evas_free(move_ee);
|
ecore_evas_free(move_ee);
|
||||||
move_ee = NULL;
|
move_ee = NULL;
|
||||||
}
|
}
|
||||||
|
move = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue