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

Luncher and Pager gadgets: Handle multi head and use the correct zone. 

This fixes T4807 and T4787
This commit is contained in:
Stephen okra Houston 2016-11-01 15:16:06 -05:00
parent 665c7072d7
commit c3b5c4a1bf
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/luncher/bar.c
View File

@ -33,7 +33,7 @@ _bar_gadget_configure(Evas_Object *g)
if (!luncher_config) return NULL;
if (luncher_config->config_dialog) return NULL;
Instance *inst = evas_object_data_get(g, "instance");
return config_luncher(e_comp_object_util_zone_get(g), inst, EINA_TRUE);
return config_luncher(e_zone_current_get(), inst, EINA_TRUE);
}
static const char *

2
src/modules/luncher/config.c
View File

@ -367,7 +367,7 @@ config_luncher(E_Zone *zone, Instance *inst, Eina_Bool bar)
popup = e_comp_object_util_add(popup, E_COMP_OBJECT_TYPE_NONE);
evas_object_layer_set(popup, E_LAYER_POPUP);
evas_object_resize(popup, zone->w / 4, zone->h / 3);
e_comp_object_util_center(popup);
e_comp_object_util_center_on_zone(popup, zone);
evas_object_show(popup);
e_comp_object_util_autoclose(popup, NULL, e_comp_object_util_autoclose_on_escape, NULL);
evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _config_close, NULL);

2
src/modules/pager/gadget/config.c
View File

@ -591,7 +591,7 @@ config_pager(E_Zone *zone)
popup = e_comp_object_util_add(popup, E_COMP_OBJECT_TYPE_NONE);
evas_object_layer_set(popup, E_LAYER_POPUP);
evas_object_resize(popup, zone->w / 4, zone->h / 3);
e_comp_object_util_center(popup);
e_comp_object_util_center_on_zone(popup, zone);
evas_object_show(popup);
e_comp_object_util_autoclose(popup, NULL, e_comp_object_util_autoclose_on_escape, NULL);
evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _config_close, NULL);

12
src/modules/pager/gadget/pager.c
View File

@ -102,7 +102,7 @@ static void _pager_desk_cb_mouse_move(void *data, Evas *e EINA_UNUSE
static void _pager_desk_cb_drag_finished(E_Drag *drag, int dropped);
static void _pager_desk_cb_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info);
static Eina_Bool _pager_popup_cb_timeout(void *data);
static Pager *_pager_new(Evas *evas);
static Pager *_pager_new(Evas *evas, E_Zone *zone);
static void _pager_free(Pager *p);
static void _pager_fill(Pager *p);
static void _pager_orient(Instance *inst, E_Gadget_Site_Orient orient);
@ -315,7 +315,7 @@ _pager_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
}
static Pager *
_pager_new(Evas *evas)
_pager_new(Evas *evas, E_Zone *zone)
{
Pager *p;
@ -325,7 +325,7 @@ _pager_new(Evas *evas)
p->o_table = elm_table_add(e_win_evas_win_get(evas));
evas_object_event_callback_add(p->o_table, EVAS_CALLBACK_RESIZE, _pager_resize, p);
elm_table_homogeneous_set(p->o_table, 1);
p->zone = e_comp_object_util_zone_get(p->o_table);
p->zone = zone;
_pager_fill(p);
pagers = eina_list_append(pagers, p);
return p;
@ -710,7 +710,7 @@ pager_popup_new(int keyaction)
/* Show popup */
pp->pager = _pager_new(e_comp->evas);
pp->pager = _pager_new(e_comp->evas, zone);
pp->pager->popup = pp;
pp->urgent = 0;
@ -818,7 +818,7 @@ _pager_gadget_configure(Evas_Object *g)
{
if (!pager_config) return NULL;
if (cfg_dialog) return NULL;
return config_pager(e_comp_object_util_zone_get(g));
return config_pager(e_zone_current_get());
}
static void
@ -1885,7 +1885,7 @@ pager_create(Evas_Object *parent, int *id EINA_UNUSED, E_Gadget_Site_Orient orie
Instance *inst;
inst = E_NEW(Instance, 1);
p = _pager_new(evas_object_evas_get(parent));
p = _pager_new(evas_object_evas_get(parent), e_comp_object_util_zone_get(parent));
p->inst = inst;
inst->pager = p;
o = p->o_table;