diff options
| author | Stephen okra Houston <smhouston88@gmail.com> | 2016-11-08 10:04:48 -0600 |
|---|---|---|
| committer | Stephen okra Houston <smhouston88@gmail.com> | 2016-11-08 10:04:48 -0600 |
| commit | 8540e6b99b2c9804b1dcbcea2c8c545b59e57f41 (patch) | |
| tree | c715f257b640b9564cd3221943ff26603160a552 | |
| parent | 7ef2098f2afb4316718e58a461765547db19f089 (diff) | |
| download | enlightenment-8540e6b99b2c9804b1dcbcea2c8c545b59e57f41.tar.gz | |
Pager Gadget: Use the current zone for popups.
| -rw-r--r-- | src/modules/pager/gadget/pager.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c index a6bc354183..adbada2df4 100644 --- a/src/modules/pager/gadget/pager.c +++ b/src/modules/pager/gadget/pager.c @@ -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, Eina_Bool popup); static void _pager_free(Pager *p); static void _pager_fill(Pager *p); static void _pager_orient(Instance *inst, E_Gadget_Site_Orient orient); @@ -314,7 +314,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, Eina_Bool popup) { Pager *p; @@ -324,7 +324,10 @@ _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); + if (popup) + p->zone = e_zone_current_get(); + else + p->zone = e_comp_object_util_zone_get(p->o_table); _pager_fill(p); pagers = eina_list_append(pagers, p); return p; @@ -708,7 +711,7 @@ pager_popup_new(int keyaction) /* Show popup */ - pp->pager = _pager_new(e_comp->evas); + pp->pager = _pager_new(e_comp->evas, EINA_TRUE); pp->pager->popup = pp; pp->urgent = 0; @@ -1916,7 +1919,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), EINA_FALSE); p->inst = inst; inst->pager = p; o = p->o_table; |