Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_icon.c
Log Message:
'mo fm work! :)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_fm.c 17 Jul 2006 10:31:49 -0000 1.8
+++ e_fm.c 17 Jul 2006 19:51:37 -0000 1.9
@@ -185,13 +185,13 @@
if (sd->config) _e_fm2_config_free(sd->config);
sd->config = E_NEW(E_Fm2_Config, 1);
if (!sd->config) return;
-// sd->config->view.mode = E_FM2_VIEW_MODE_ICONS;
- sd->config->view.mode = E_FM2_VIEW_MODE_LIST;
+ sd->config->view.mode = E_FM2_VIEW_MODE_ICONS;
+// sd->config->view.mode = E_FM2_VIEW_MODE_LIST;
sd->config->icon.icon.w = 64;
sd->config->icon.icon.h = 64;
sd->config->icon.list.w = 24;
sd->config->icon.list.h = 24;
- sd->config->icon.fixed.w = 1;
+ sd->config->icon.fixed.w = 0;
sd->config->icon.fixed.h = 1;
sd->config->list.sort.no_case = 1;
sd->config->icon.extension.show = 0;
@@ -881,10 +881,12 @@
obj = edje_object_add(evas_object_evas_get(sd->obj));
e_theme_edje_object_set(obj, "base/theme/fileman",
"fileman/icon/variable");
- edje_object_part_text_set(obj, "label", ic->file);
+ _e_fm2_icon_label_set(ic, obj);
edje_object_size_min_calc(obj, &mw, &mh);
evas_object_del(obj);
}
+ ic->w = mw;
+ ic->h = mh;
if (sd->config->icon.fixed.w) ic->w = sd->config->icon.icon.w;
if (sd->config->icon.fixed.h) ic->h = sd->config->icon.icon.h;
ic->min_w = mw;
@@ -961,14 +963,17 @@
e_theme_edje_object_set(ic->obj, "base/theme/widgets",
"fileman/list/variable");
}
- _e_fm2_icon_label_set(ic, ic->obj);
}
else
{
- e_theme_edje_object_set(ic->obj, "base/theme/fileman",
- "fileman/icon_normal");
- edje_object_part_text_set(ic->obj, "icon_title", ic->file);
+ if (ic->sd->config->icon.fixed.w)
+ e_theme_edje_object_set(ic->obj, "base/theme/fileman",
+ "fileman/icon/fixed");
+ else
+ e_theme_edje_object_set(ic->obj, "base/theme/fileman",
+ "fileman/icon/variable");
}
+ _e_fm2_icon_label_set(ic, ic->obj);
evas_object_clip_set(ic->obj, ic->sd->clip);
evas_object_move(ic->obj,
ic->sd->x + ic->x - ic->sd->pos.x,
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_icon.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_icon.c 31 May 2006 18:41:37 -0000 1.14
+++ e_icon.c 17 Jul 2006 19:51:37 -0000 1.15
@@ -318,6 +318,7 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if ((sd->x == x) && (sd->y == y)) return;
sd->x = x;
sd->y = y;
_e_icon_smart_reconfigure(sd);
@@ -330,6 +331,7 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if ((sd->w == w) && (sd->h == h)) return;
sd->w = w;
sd->h = h;
_e_icon_smart_reconfigure(sd);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
