swagtoy
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting 

SVN revision: 72530
This commit is contained in:
Mike Blumenkrantz 2012-06-20 08:42:17 +00:00
parent a799a7c4be
commit d0f5d7d5b3
1 changed files with 1137 additions and 1118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/bin/e_actions.c
View File

@ -1079,11 +1079,13 @@ ACT_FN_GO(window_push, )
e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
if (hdir < 0) x = zx;
else if (hdir > 0) x = zx + zw - bd->w;
else if (hdir > 0)
x = zx + zw - bd->w;
else x = bd->x;
if (vdir < 0) y = zy;
else if (vdir > 0) y = zy + zh - bd->h;
else if (vdir > 0)
y = zy + zh - bd->h;
else y = bd->y;
bd_list = e_container_border_list_first(bd->zone->container);
@ -1238,12 +1240,18 @@ _e_actions_zone_get(E_Object *obj)
if (obj)
{
if (obj->type == (int)E_MANAGER_TYPE) return e_util_zone_current_get((E_Manager *)obj);
else if (obj->type == (int)E_CONTAINER_TYPE) return e_util_zone_current_get(((E_Container *)obj)->manager);
else if (obj->type == (int)E_ZONE_TYPE) return (E_Zone *)obj;
else if (obj->type == (int)E_BORDER_TYPE) return ((E_Border *)obj)->zone;
else if (obj->type == (int)E_SHELF_TYPE) return ((E_Shelf *)obj)->zone;
else if (obj->type == (int)E_POPUP_TYPE) return ((E_Popup *)obj)->zone;
else if (obj->type == (int)E_WIN_TYPE) return ((E_Win *)obj)->border->zone;
else if (obj->type == (int)E_CONTAINER_TYPE)
return e_util_zone_current_get(((E_Container *)obj)->manager);
else if (obj->type == (int)E_ZONE_TYPE)
return (E_Zone *)obj;
else if (obj->type == (int)E_BORDER_TYPE)
return ((E_Border *)obj)->zone;
else if (obj->type == (int)E_SHELF_TYPE)
return ((E_Shelf *)obj)->zone;
else if (obj->type == (int)E_POPUP_TYPE)
return ((E_Popup *)obj)->zone;
else if (obj->type == (int)E_WIN_TYPE)
return ((E_Win *)obj)->border->zone;
}
return e_util_zone_current_get(e_manager_current_get());
}
@ -1323,6 +1331,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
wev->curr.x = zone->w - offset;
}
break;
case E_ZONE_EDGE_RIGHT:
if (ACT_FLIP_RIGHT(zone))
{
@ -1332,6 +1341,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
wev->curr.x = offset;
}
break;
case E_ZONE_EDGE_TOP:
if (ACT_FLIP_UP(zone))
{
@ -1341,6 +1351,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
wev->curr.y = zone->h - offset;
}
break;
case E_ZONE_EDGE_BOTTOM:
if (ACT_FLIP_DOWN(zone))
{
@ -1350,6 +1361,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
wev->curr.y = offset;
}
break;
case E_ZONE_EDGE_TOP_LEFT:
if (ACT_FLIP_UP_LEFT(zone))
{
@ -1359,6 +1371,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
wev->curr.y = zone->h - offset;
}
break;
case E_ZONE_EDGE_TOP_RIGHT:
if (ACT_FLIP_UP_RIGHT(zone))
{
@ -1368,6 +1381,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
wev->curr.y = zone->h - offset;
}
break;
case E_ZONE_EDGE_BOTTOM_LEFT:
if (ACT_FLIP_DOWN_LEFT(zone))
{
@ -1377,6 +1391,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
wev->curr.x = zone->w - offset;
}
break;
case E_ZONE_EDGE_BOTTOM_RIGHT:
if (ACT_FLIP_DOWN_RIGHT(zone))
{
@ -1386,6 +1401,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
wev->curr.x = offset;
}
break;
default:
break;
}
@ -1433,7 +1449,6 @@ ACT_FN_GO(desk_linear_flip_to, )
}
}
#define DESK_ACTION_ALL(zone, act) \
E_Zone * zone; \
Eina_List *lm, *lc, *lz; \
@ -1448,7 +1463,6 @@ ACT_FN_GO(desk_linear_flip_to, )
} \
}
/***************************************************************************/
ACT_FN_GO(desk_flip_by_all, )
{
@ -2383,6 +2397,7 @@ ACT_FN_GO_EDGE(shelf_show, )
(ev->y >= es->y) && (ev->y <= (es->y + es->h)))
ACT_SHELF_SHOW(params, es);
break;
case E_ZONE_EDGE_RIGHT:
if ((es->gadcon->orient == E_GADCON_ORIENT_RIGHT ||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_RT ||
@ -2390,6 +2405,7 @@ ACT_FN_GO_EDGE(shelf_show, )
(ev->y >= es->y) && (ev->y <= (es->y + es->h)))
ACT_SHELF_SHOW(params, es);
break;
case E_ZONE_EDGE_TOP:
if ((es->gadcon->orient == E_GADCON_ORIENT_TOP ||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_TL ||
@ -2397,6 +2413,7 @@ ACT_FN_GO_EDGE(shelf_show, )
(ev->x >= es->x) && (ev->x <= (es->x + es->w)))
ACT_SHELF_SHOW(params, es);
break;
case E_ZONE_EDGE_BOTTOM:
if ((es->gadcon->orient == E_GADCON_ORIENT_BOTTOM ||
es->gadcon->orient == E_GADCON_ORIENT_CORNER_BL ||
@ -2404,6 +2421,7 @@ ACT_FN_GO_EDGE(shelf_show, )
(ev->x >= es->x) && (ev->x <= (es->x + es->w)))
ACT_SHELF_SHOW(params, es);
break;
default:
break;
}
@ -3425,3 +3443,4 @@ _action_groups_sort_cb(const void *d1, const void *d2)
if (!(g2 = d2)) return -1;
return strcmp(g1->act_grp, g2->act_grp);
}