return icon.list size if icon.icon size is not set

SVN revision: 42392
This commit is contained in:
Hannes Janetzek 2009-09-10 21:02:09 +00:00
parent df0d471509
commit 47415c096d
2 changed files with 6 additions and 4 deletions

View File

@ -550,7 +550,9 @@ _e_fm2_icon_w_get(const E_Fm2_Smart_Data *sd)
{
if (sd->icon_size > -1)
return sd->icon_size * e_scale;
return sd->config->icon.icon.w;
if (sd->config->icon.icon.w)
return sd->config->icon.icon.w;
return sd->config->icon.list.w;
}
static inline Evas_Coord
@ -558,7 +560,9 @@ _e_fm2_icon_h_get(const E_Fm2_Smart_Data *sd)
{
if (sd->icon_size > -1)
return sd->icon_size * e_scale;
return sd->config->icon.icon.h;
if (sd->config->icon.icon.h)
return sd->config->icon.icon.h;
return sd->config->icon.list.h;
}
static int

View File

@ -48,8 +48,6 @@ e_widget_flist_add(Evas *evas)
wd->fmc.view.no_subdir_jump = 0;
wd->fmc.icon.list.w = 48;
wd->fmc.icon.list.h = 48;
wd->fmc.icon.icon.w = 48;
wd->fmc.icon.icon.h = 48;
wd->fmc.icon.fixed.w = 1;
wd->fmc.icon.fixed.h = 1;
wd->fmc.icon.extension.show = 0;