change shelf style during config while gadcon is unpopulated for a small speedup, also fixes crash when changing size and style

ticket #2048


SVN revision: 81332
This commit is contained in:
Mike Blumenkrantz 2012-12-19 09:18:11 +00:00
parent aa35b742c5
commit 602c4dd07a
1 changed files with 11 additions and 12 deletions

View File

@ -277,18 +277,6 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
E_Config_Shelf_Desk *sd;
int recreate = 0;
if (!cfdata->escfg->style)
{
cfdata->escfg->style = eina_stringshare_ref(cfdata->style);
e_shelf_style_set(cfdata->es, cfdata->style);
}
else if ((cfdata->escfg->style) &&
(cfdata->escfg->style != cfdata->style))
{
eina_stringshare_replace(&cfdata->escfg->style, cfdata->style);
e_shelf_style_set(cfdata->es, cfdata->style);
}
if (cfdata->escfg->orient != cfdata->orient)
{
cfdata->escfg->orient = cfdata->orient;
@ -370,6 +358,17 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
}
e_gadcon_unpopulate(cfdata->es->gadcon);
if (!cfdata->escfg->style)
{
cfdata->escfg->style = eina_stringshare_ref(cfdata->style);
e_shelf_style_set(cfdata->es, cfdata->style);
}
else if ((cfdata->escfg->style) &&
(cfdata->escfg->style != cfdata->style))
{
eina_stringshare_replace(&cfdata->escfg->style, cfdata->style);
e_shelf_style_set(cfdata->es, cfdata->style);
}
if (recreate)
{
E_Zone *zone;