enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

fix crazy horizontal scrollbar flickering and resizing in file selector for efm 

SVN revision: 72463
This commit is contained in:
Mike Blumenkrantz 2012-06-19 09:48:36 +00:00
parent 18ad1f0f08
commit fbda443407
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/themes/default.edc
View File

@ -22892,7 +22892,7 @@ collections {
text { text {
font: "Sans"; font: "Sans";
size: 10; size: 10;
min: 0 1; min: 1 1;
align: 0.0 0.5; align: 0.0 0.5;
text_class: "ilist_item"; text_class: "ilist_item";
} }

12
src/bin/e_fm.c
View File

@ -3939,14 +3939,11 @@ _e_fm2_icons_place_list(E_Fm2_Smart_Data *sd)
ic->w = ic->min_w; ic->w = ic->min_w;
y += ic->h; y += ic->h;
ic->odd = (i & 0x01); ic->odd = (i & 0x01);
if ((ic->x + ic->w) > sd->max.w) sd->max.w = ic->x + ic->w; if ((ic->w != sd->w) && ((ic->x + ic->w) > sd->max.w)) sd->max.w = ic->x + ic->w;
else if (ic->min_w > sd->max.w) sd->max.w = ic->min_w;
if ((ic->y + ic->h) > sd->max.h) sd->max.h = ic->y + ic->h; if ((ic->y + ic->h) > sd->max.h) sd->max.h = ic->y + ic->h;
i++; i++;
} }
EINA_LIST_FOREACH(sd->icons, l, ic)
{
ic->w = sd->max.w;
}
} }
static void static void
@ -4462,7 +4459,6 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
break; break;
case E_FM2_VIEW_MODE_LIST: case E_FM2_VIEW_MODE_LIST:
{
obj = ic->sd->tmp.obj; obj = ic->sd->tmp.obj;
if (!obj) if (!obj)
{ {
@ -4488,9 +4484,7 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
edje_extern_object_max_size_set(obj2, ic->sd->config->icon.list.w, ic->sd->config->icon.list.h); edje_extern_object_max_size_set(obj2, ic->sd->config->icon.list.w, ic->sd->config->icon.list.h);
edje_object_part_swallow(obj, "e.swallow.icon", obj2); edje_object_part_swallow(obj, "e.swallow.icon", obj2);
edje_object_size_min_calc(obj, &mw, &mh); edje_object_size_min_calc(obj, &mw, &mh);
} ic->w = mw;
if (mw < ic->sd->w) ic->w = ic->sd->w;
else ic->w = mw;
ic->h = mh; ic->h = mh;
ic->min_w = mw; ic->min_w = mw;
ic->min_h = mh; ic->min_h = mh;