forked from enlightenment/enlightenment
remove E_Event_Compositor_Resize struct
corresponding event no longer sends event info
This commit is contained in:
parent
1fe1c94245
commit
2a9296e0ec
|
@ -9,12 +9,9 @@ _e_comp_canvas_cb_del()
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_comp_canvas_event_compositor_resize_free(void *data EINA_UNUSED, void *event)
|
_e_comp_canvas_event_compositor_resize_free(void *data EINA_UNUSED, void *event EINA_UNUSED)
|
||||||
{
|
{
|
||||||
E_Event_Compositor_Resize *ev = event;
|
e_object_unref(E_OBJECT(e_comp));
|
||||||
|
|
||||||
e_object_unref(E_OBJECT(ev->comp));
|
|
||||||
free(ev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////////////////////
|
///////////////////////////////////
|
||||||
|
@ -333,7 +330,6 @@ e_comp_canvas_zone_update(E_Zone *zone)
|
||||||
EAPI void
|
EAPI void
|
||||||
e_comp_canvas_update(void)
|
e_comp_canvas_update(void)
|
||||||
{
|
{
|
||||||
E_Event_Compositor_Resize *ev;
|
|
||||||
Eina_List *l, *screens, *zones = NULL, *ll;
|
Eina_List *l, *screens, *zones = NULL, *ll;
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
E_Screen *scr;
|
E_Screen *scr;
|
||||||
|
@ -428,10 +424,8 @@ e_comp_canvas_update(void)
|
||||||
if (!changed) return;
|
if (!changed) return;
|
||||||
if (!starting)
|
if (!starting)
|
||||||
{
|
{
|
||||||
ev = calloc(1, sizeof(E_Event_Compositor_Resize));
|
|
||||||
ev->comp = e_comp;
|
|
||||||
e_object_ref(E_OBJECT(e_comp));
|
e_object_ref(E_OBJECT(e_comp));
|
||||||
ecore_event_add(E_EVENT_COMPOSITOR_RESIZE, ev, _e_comp_canvas_event_compositor_resize_free, NULL);
|
ecore_event_add(E_EVENT_COMPOSITOR_RESIZE, NULL, _e_comp_canvas_event_compositor_resize_free, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
EINA_LIST_FOREACH(e_comp->zones, l, zone)
|
EINA_LIST_FOREACH(e_comp->zones, l, zone)
|
||||||
|
|
|
@ -2,17 +2,10 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct _E_Event_Compositor_Resize E_Event_Compositor_Resize;
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#ifndef E_COMP_CANVAS_H
|
#ifndef E_COMP_CANVAS_H
|
||||||
#define E_COMP_CANVAS_H
|
#define E_COMP_CANVAS_H
|
||||||
|
|
||||||
struct _E_Event_Compositor_Resize
|
|
||||||
{
|
|
||||||
E_Comp *comp;
|
|
||||||
};
|
|
||||||
|
|
||||||
extern EAPI int E_EVENT_COMPOSITOR_RESIZE;
|
extern EAPI int E_EVENT_COMPOSITOR_RESIZE;
|
||||||
|
|
||||||
EAPI Eina_Bool e_comp_canvas_init(void);
|
EAPI Eina_Bool e_comp_canvas_init(void);
|
||||||
|
|
|
@ -1046,9 +1046,8 @@ _pager_cb_event_client_urgent_change(void *data EINA_UNUSED, int type EINA_UNUSE
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, void *event)
|
_pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, void *event EINA_UNUSED)
|
||||||
{
|
{
|
||||||
E_Event_Compositor_Resize *ev = event;
|
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
Pager *p;
|
Pager *p;
|
||||||
|
|
||||||
|
@ -1057,8 +1056,6 @@ _pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, vo
|
||||||
Eina_List *l2;
|
Eina_List *l2;
|
||||||
Pager_Desk *pd;
|
Pager_Desk *pd;
|
||||||
|
|
||||||
if (p->zone->comp != ev->comp) continue;
|
|
||||||
|
|
||||||
EINA_LIST_FOREACH(p->desks, l2, pd)
|
EINA_LIST_FOREACH(p->desks, l2, pd)
|
||||||
e_layout_virtual_size_set(pd->o_layout, pd->desk->zone->w,
|
e_layout_virtual_size_set(pd->o_layout, pd->desk->zone->w,
|
||||||
pd->desk->zone->h);
|
pd->desk->zone->h);
|
||||||
|
|
|
@ -1759,9 +1759,8 @@ _pager_cb_event_bg_update(void *data __UNUSED__, int type __UNUSED__, void *even
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, void *event)
|
_pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, void *event EINA_UNUSED)
|
||||||
{
|
{
|
||||||
E_Event_Compositor_Resize *ev = event;
|
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
Pager *p;
|
Pager *p;
|
||||||
|
|
||||||
|
@ -1770,8 +1769,6 @@ _pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, vo
|
||||||
Eina_List *l2;
|
Eina_List *l2;
|
||||||
Pager_Desk *pd;
|
Pager_Desk *pd;
|
||||||
|
|
||||||
if (p->zone->comp != ev->comp) continue;
|
|
||||||
|
|
||||||
EINA_LIST_FOREACH(p->desks, l2, pd)
|
EINA_LIST_FOREACH(p->desks, l2, pd)
|
||||||
e_layout_virtual_size_set(pd->o_layout, pd->desk->zone->w,
|
e_layout_virtual_size_set(pd->o_layout, pd->desk->zone->w,
|
||||||
pd->desk->zone->h);
|
pd->desk->zone->h);
|
||||||
|
|
|
@ -1297,7 +1297,7 @@ _compositor_resize_hook_desk_reapply(E_Desk *desk)
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
_compositor_resize_hook(void *data EINA_UNUSED, int type EINA_UNUSED,
|
_compositor_resize_hook(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
E_Event_Compositor_Resize *ev EINA_UNUSED)
|
void *ev EINA_UNUSED)
|
||||||
{
|
{
|
||||||
_foreach_desk(_compositor_resize_hook_desk_reapply);
|
_foreach_desk(_compositor_resize_hook_desk_reapply);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue