check for shelf creation, also apply autohide settings
SVN revision: 74632
This commit is contained in:
parent
f809f02d60
commit
da323af79c
|
@ -82,8 +82,13 @@ ngi_new(Config_Item *cfg)
|
||||||
ng->o_bg = edje_object_add(ng->evas);
|
ng->o_bg = edje_object_add(ng->evas);
|
||||||
ng->o_frame = edje_object_add(ng->evas);
|
ng->o_frame = edje_object_add(ng->evas);
|
||||||
ng->o_label = edje_object_add(ng->evas);
|
ng->o_label = edje_object_add(ng->evas);
|
||||||
es = e_shelf_zone_dummy_new(zone, ng->o_frame, eina_list_count(ngi_config->instances));
|
ng->es = e_shelf_zone_dummy_new(zone, ng->o_frame, eina_list_count(ngi_config->instances));
|
||||||
e_shelf_orient(es, cfg->orient);
|
if (ng->es)
|
||||||
|
{
|
||||||
|
e_shelf_orient(ng->es, cfg->orient);
|
||||||
|
ng->es->cfg->autohide = ng->cfg->autohide;
|
||||||
|
ng->es->cfg->overlap = (ng->cfg->autohide == AUTOHIDE_OVERLAP);
|
||||||
|
}
|
||||||
|
|
||||||
switch(cfg->orient)
|
switch(cfg->orient)
|
||||||
{
|
{
|
||||||
|
|
|
@ -129,6 +129,7 @@ struct _Ng
|
||||||
Config_Item *cfg;
|
Config_Item *cfg;
|
||||||
|
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
|
E_Shelf *es;
|
||||||
|
|
||||||
Evas_Object *o_bg;
|
Evas_Object *o_bg;
|
||||||
Evas_Object *o_frame;
|
Evas_Object *o_frame;
|
||||||
|
|
|
@ -373,6 +373,11 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
if (ci->autohide == AUTOHIDE_NORMAL)
|
if (ci->autohide == AUTOHIDE_NORMAL)
|
||||||
ng->hide = EINA_TRUE;
|
ng->hide = EINA_TRUE;
|
||||||
|
if (ng->es)
|
||||||
|
{
|
||||||
|
ng->es->cfg->autohide = ng->cfg->autohide;
|
||||||
|
ng->es->cfg->overlap = (ng->cfg->autohide == AUTOHIDE_OVERLAP);
|
||||||
|
}
|
||||||
ng->hide_step = 0;
|
ng->hide_step = 0;
|
||||||
ng->hide_state = show;
|
ng->hide_state = show;
|
||||||
ngi_reposition(ng);
|
ngi_reposition(ng);
|
||||||
|
|
Loading…
Reference in New Issue