pager: Fix pager sizing/resizing when on the desktop.
Adding a pager to the background/desktop caused some issues for users. This resolves the issue, whilst trying to remain readable. @fix
This commit is contained in:
parent
728a04274b
commit
d4d784e56e
|
@ -332,12 +332,30 @@ _pager_recalc(void *data)
|
||||||
Pager_Desk *pd;
|
Pager_Desk *pd;
|
||||||
Evas_Coord mw = 0, mh = 0;
|
Evas_Coord mw = 0, mh = 0;
|
||||||
int w, h, zw, zh, w2, h2;
|
int w, h, zw, zh, w2, h2;
|
||||||
|
E_Gadcon_Orient orient;
|
||||||
|
Eina_Bool shelf = 1;
|
||||||
|
|
||||||
|
if (!p->inst || !p->inst->gcc || !p->inst->gcc->gadcon) return;
|
||||||
|
|
||||||
p->recalc = NULL;
|
p->recalc = NULL;
|
||||||
zw = p->zone->w; zh = p->zone->h;
|
zw = p->zone->w; zh = p->zone->h;
|
||||||
pd = eina_list_data_get(p->desks);
|
pd = eina_list_data_get(p->desks);
|
||||||
if (!pd) return;
|
if (!pd) return;
|
||||||
|
|
||||||
|
orient = p->inst->gcc->gadcon->orient;
|
||||||
|
switch (orient)
|
||||||
|
{
|
||||||
|
case E_GADCON_ORIENT_FLOAT:
|
||||||
|
case E_GADCON_ORIENT_VERT:
|
||||||
|
case E_GADCON_ORIENT_HORIZ:
|
||||||
|
shelf = 0;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!shelf) return;
|
||||||
|
|
||||||
edje_object_size_min_calc(pd->o_desk, &mw, &mh);
|
edje_object_size_min_calc(pd->o_desk, &mw, &mh);
|
||||||
evas_object_geometry_get(pd->o_desk, NULL, NULL, &w, &h);
|
evas_object_geometry_get(pd->o_desk, NULL, NULL, &w, &h);
|
||||||
w -= mw; h -= mh;
|
w -= mw; h -= mh;
|
||||||
|
@ -348,14 +366,12 @@ _pager_recalc(void *data)
|
||||||
}
|
}
|
||||||
w = w2; h = h2;
|
w = w2; h = h2;
|
||||||
w += mw; h += mh;
|
w += mw; h += mh;
|
||||||
if ((p->inst) && (p->inst->gcc))
|
|
||||||
{
|
|
||||||
if (p->invert)
|
if (p->invert)
|
||||||
e_gadcon_client_aspect_set(p->inst->gcc, p->ynum * w, p->xnum * h);
|
e_gadcon_client_aspect_set(p->inst->gcc, p->ynum * w, p->xnum * h);
|
||||||
else
|
else
|
||||||
e_gadcon_client_aspect_set(p->inst->gcc, p->xnum * w, p->ynum * h);
|
e_gadcon_client_aspect_set(p->inst->gcc, p->xnum * w, p->ynum * h);
|
||||||
_aspect(p->inst->gcc);
|
_aspect(p->inst->gcc);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue