Merge branch 'terminology-1.2'

This commit is contained in:
Boris Faure 2018-08-10 08:05:39 +02:00
commit 8276135b50
1 changed files with 6 additions and 1 deletions

View File

@ -2681,11 +2681,12 @@ _tabs_restore(Tabs *tabs)
Term_Container *tc = (Term_Container*)tabs;
Term *term;
Solo *solo;
Win *wn = tc->wn;
if (!tabs->selector)
return;
EINA_LIST_FOREACH(tc->wn->terms, l, term)
EINA_LIST_FOREACH(wn->terms, l, term)
{
if (term->unswallowed)
{
@ -2714,6 +2715,8 @@ _tabs_restore(Tabs *tabs)
tabs->selector = NULL;
tabs->selector_bg = NULL;
wn->on_popover = EINA_FALSE;
/* XXX: reswallow in parent */
tc->parent->swallow(tc->parent, tc, tc);
solo = (Solo*)tabs->current->tc;
@ -2782,6 +2785,8 @@ _cb_tab_selector_show(Tabs *tabs, Tab_Item *to_item)
if (tabs->selector_bg)
return;
wn->on_popover = EINA_TRUE;
o = tc->get_evas_object(tc);
evas_object_geometry_get(o, &x, &y, &w, &h);