parent
6e445ae53c
commit
94eb10404e
|
@ -1213,7 +1213,8 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
|
||||||
E_Desk *current = NULL;
|
E_Desk *current = NULL;
|
||||||
E_Event_Pointer_Warp *wev;
|
E_Event_Pointer_Warp *wev;
|
||||||
int x, y, offset = 25;
|
int x, y, offset = 25;
|
||||||
|
|
||||||
|
if (!ev) return; // with flip on _e_zone_cb_edge_timer we don't have ev!!!
|
||||||
zone = _e_actions_zone_get(obj);
|
zone = _e_actions_zone_get(obj);
|
||||||
wev = E_NEW(E_Event_Pointer_Warp, 1);
|
wev = E_NEW(E_Event_Pointer_Warp, 1);
|
||||||
if ((!wev) || (!zone)) return;
|
if ((!wev) || (!zone)) return;
|
||||||
|
@ -1225,9 +1226,9 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
|
||||||
if (sscanf(params, "%i", &offset) != 1)
|
if (sscanf(params, "%i", &offset) != 1)
|
||||||
offset = 25;
|
offset = 25;
|
||||||
}
|
}
|
||||||
switch(ev->edge)
|
switch (ev->edge)
|
||||||
{
|
{
|
||||||
case E_ZONE_EDGE_LEFT:
|
case E_ZONE_EDGE_LEFT:
|
||||||
if (ACT_FLIP_LEFT(zone))
|
if (ACT_FLIP_LEFT(zone))
|
||||||
{
|
{
|
||||||
e_zone_desk_flip_by(zone, -1, 0);
|
e_zone_desk_flip_by(zone, -1, 0);
|
||||||
|
@ -1235,26 +1236,26 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
|
||||||
wev->curr.y = y;
|
wev->curr.y = y;
|
||||||
wev->curr.x = zone->w - offset;
|
wev->curr.x = zone->w - offset;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case E_ZONE_EDGE_RIGHT:
|
case E_ZONE_EDGE_RIGHT:
|
||||||
if (ACT_FLIP_RIGHT(zone))
|
if (ACT_FLIP_RIGHT(zone))
|
||||||
{
|
{
|
||||||
e_zone_desk_flip_by(zone, 1, 0);
|
e_zone_desk_flip_by(zone, 1, 0);
|
||||||
ecore_x_pointer_warp(zone->container->win, offset, y);
|
ecore_x_pointer_warp(zone->container->win, offset, y);
|
||||||
wev->curr.y = y;
|
wev->curr.y = y;
|
||||||
wev->curr.x = offset;
|
wev->curr.x = offset;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case E_ZONE_EDGE_TOP:
|
case E_ZONE_EDGE_TOP:
|
||||||
if (ACT_FLIP_UP(zone))
|
if (ACT_FLIP_UP(zone))
|
||||||
{
|
{
|
||||||
e_zone_desk_flip_by(zone, 0, -1);
|
e_zone_desk_flip_by(zone, 0, -1);
|
||||||
ecore_x_pointer_warp(zone->container->win, x, zone->h - offset);
|
ecore_x_pointer_warp(zone->container->win, x, zone->h - offset);
|
||||||
wev->curr.x = x;
|
wev->curr.x = x;
|
||||||
wev->curr.y = zone->h - offset;
|
wev->curr.y = zone->h - offset;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case E_ZONE_EDGE_BOTTOM:
|
case E_ZONE_EDGE_BOTTOM:
|
||||||
if (ACT_FLIP_DOWN(zone))
|
if (ACT_FLIP_DOWN(zone))
|
||||||
{
|
{
|
||||||
e_zone_desk_flip_by(zone, 0, 1);
|
e_zone_desk_flip_by(zone, 0, 1);
|
||||||
|
@ -1262,26 +1263,26 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
|
||||||
wev->curr.x = x;
|
wev->curr.x = x;
|
||||||
wev->curr.y = offset;
|
wev->curr.y = offset;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case E_ZONE_EDGE_TOP_LEFT:
|
case E_ZONE_EDGE_TOP_LEFT:
|
||||||
if (ACT_FLIP_UP_LEFT(zone))
|
if (ACT_FLIP_UP_LEFT(zone))
|
||||||
{
|
{
|
||||||
e_zone_desk_flip_by(zone, -1, -1);
|
e_zone_desk_flip_by(zone, -1, -1);
|
||||||
ecore_x_pointer_warp(zone->container->win, zone->w - offset, zone->h - offset);
|
ecore_x_pointer_warp(zone->container->win, zone->w - offset, zone->h - offset);
|
||||||
wev->curr.x = zone->w - offset;
|
wev->curr.x = zone->w - offset;
|
||||||
wev->curr.y = zone->h - offset;
|
wev->curr.y = zone->h - offset;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case E_ZONE_EDGE_TOP_RIGHT:
|
case E_ZONE_EDGE_TOP_RIGHT:
|
||||||
if (ACT_FLIP_UP_RIGHT(zone))
|
if (ACT_FLIP_UP_RIGHT(zone))
|
||||||
{
|
{
|
||||||
e_zone_desk_flip_by(zone, 1, -1);
|
e_zone_desk_flip_by(zone, 1, -1);
|
||||||
ecore_x_pointer_warp(zone->container->win, offset, zone->h - offset);
|
ecore_x_pointer_warp(zone->container->win, offset, zone->h - offset);
|
||||||
wev->curr.x = offset;
|
wev->curr.x = offset;
|
||||||
wev->curr.y = zone->h - offset;
|
wev->curr.y = zone->h - offset;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case E_ZONE_EDGE_BOTTOM_LEFT:
|
case E_ZONE_EDGE_BOTTOM_LEFT:
|
||||||
if (ACT_FLIP_DOWN_LEFT(zone))
|
if (ACT_FLIP_DOWN_LEFT(zone))
|
||||||
{
|
{
|
||||||
e_zone_desk_flip_by(zone, -1, 1);
|
e_zone_desk_flip_by(zone, -1, 1);
|
||||||
|
@ -1289,8 +1290,8 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
|
||||||
wev->curr.y = offset;
|
wev->curr.y = offset;
|
||||||
wev->curr.x = zone->w - offset;
|
wev->curr.x = zone->w - offset;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case E_ZONE_EDGE_BOTTOM_RIGHT:
|
case E_ZONE_EDGE_BOTTOM_RIGHT:
|
||||||
if (ACT_FLIP_DOWN_RIGHT(zone))
|
if (ACT_FLIP_DOWN_RIGHT(zone))
|
||||||
{
|
{
|
||||||
e_zone_desk_flip_by(zone, 1, 1);
|
e_zone_desk_flip_by(zone, 1, 1);
|
||||||
|
@ -1298,11 +1299,11 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
|
||||||
wev->curr.y = offset;
|
wev->curr.y = offset;
|
||||||
wev->curr.x = offset;
|
wev->curr.x = offset;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
current = e_desk_current_get(zone);
|
current = e_desk_current_get(zone);
|
||||||
if (current)
|
if (current)
|
||||||
ecore_event_add(E_EVENT_POINTER_WARP, wev, NULL, NULL);
|
ecore_event_add(E_EVENT_POINTER_WARP, wev, NULL, NULL);
|
||||||
|
@ -2266,12 +2267,14 @@ ACT_FN_GO_EDGE(shelf_show, )
|
||||||
{
|
{
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
E_Shelf *es;
|
E_Shelf *es;
|
||||||
|
|
||||||
if (params)
|
if (params)
|
||||||
{
|
{
|
||||||
for (; *params != '\0'; params++)
|
for (; *params != '\0'; params++)
|
||||||
if (!isspace(*params))
|
{
|
||||||
break;
|
if (!isspace(*params))
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (*params == '\0')
|
if (*params == '\0')
|
||||||
params = NULL;
|
params = NULL;
|
||||||
}
|
}
|
||||||
|
@ -2280,36 +2283,36 @@ ACT_FN_GO_EDGE(shelf_show, )
|
||||||
{
|
{
|
||||||
switch(ev->edge)
|
switch(ev->edge)
|
||||||
{
|
{
|
||||||
case E_ZONE_EDGE_LEFT:
|
case E_ZONE_EDGE_LEFT:
|
||||||
if ((es->gadcon->orient == E_GADCON_ORIENT_LEFT ||
|
if ((es->gadcon->orient == E_GADCON_ORIENT_LEFT ||
|
||||||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_LT ||
|
es->gadcon->orient == E_GADCON_ORIENT_CORNER_LT ||
|
||||||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_LB) &&
|
es->gadcon->orient == E_GADCON_ORIENT_CORNER_LB) &&
|
||||||
(ev->y >= es->y) && (ev->y <= (es->y + es->h)))
|
(ev->y >= es->y) && (ev->y <= (es->y + es->h)))
|
||||||
ACT_SHELF_SHOW(params, es);
|
ACT_SHELF_SHOW(params, es);
|
||||||
break;
|
break;
|
||||||
case E_ZONE_EDGE_RIGHT:
|
case E_ZONE_EDGE_RIGHT:
|
||||||
if ((es->gadcon->orient == E_GADCON_ORIENT_RIGHT ||
|
if ((es->gadcon->orient == E_GADCON_ORIENT_RIGHT ||
|
||||||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_RT ||
|
es->gadcon->orient == E_GADCON_ORIENT_CORNER_RT ||
|
||||||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_RB) &&
|
es->gadcon->orient == E_GADCON_ORIENT_CORNER_RB) &&
|
||||||
(ev->y >= es->y) && (ev->y <= (es->y + es->h)))
|
(ev->y >= es->y) && (ev->y <= (es->y + es->h)))
|
||||||
ACT_SHELF_SHOW(params, es);
|
ACT_SHELF_SHOW(params, es);
|
||||||
break;
|
break;
|
||||||
case E_ZONE_EDGE_TOP:
|
case E_ZONE_EDGE_TOP:
|
||||||
if ((es->gadcon->orient == E_GADCON_ORIENT_TOP ||
|
if ((es->gadcon->orient == E_GADCON_ORIENT_TOP ||
|
||||||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_TL ||
|
es->gadcon->orient == E_GADCON_ORIENT_CORNER_TL ||
|
||||||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_TR) &&
|
es->gadcon->orient == E_GADCON_ORIENT_CORNER_TR) &&
|
||||||
(ev->x >= es->x) && (ev->x <= (es->x + es->w)))
|
(ev->x >= es->x) && (ev->x <= (es->x + es->w)))
|
||||||
ACT_SHELF_SHOW(params, es);
|
ACT_SHELF_SHOW(params, es);
|
||||||
break;
|
break;
|
||||||
case E_ZONE_EDGE_BOTTOM:
|
case E_ZONE_EDGE_BOTTOM:
|
||||||
if ((es->gadcon->orient == E_GADCON_ORIENT_BOTTOM ||
|
if ((es->gadcon->orient == E_GADCON_ORIENT_BOTTOM ||
|
||||||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_BL ||
|
es->gadcon->orient == E_GADCON_ORIENT_CORNER_BL ||
|
||||||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_BR) &&
|
es->gadcon->orient == E_GADCON_ORIENT_CORNER_BR) &&
|
||||||
(ev->x >= es->x) && (ev->x <= (es->x + es->w)))
|
(ev->x >= es->x) && (ev->x <= (es->x + es->w)))
|
||||||
ACT_SHELF_SHOW(params, es);
|
ACT_SHELF_SHOW(params, es);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue