Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_icon.c e_fileman_smart.c e_icon_layout.c
Log Message:
- temp fix until icons are properly done
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_fileman_icon.c 4 Nov 2005 03:33:22 -0000 1.15
+++ e_fileman_icon.c 4 Nov 2005 14:58:03 -0000 1.16
@@ -139,10 +139,7 @@
sd->ih,
1);
evas_object_smart_member_add(sd->thumb_object, sd->obj);
-
sd->image_object = edje_object_add(sd->evas);
- edje_extern_object_min_size_set(sd->image_object, sd->iw, sd->ih);
- edje_extern_object_max_size_set(sd->image_object, sd->iw, sd->ih);
e_theme_edje_object_set(sd->image_object, "base/theme/fileman",
"fileman/icon_thumb");
edje_object_part_swallow(sd->image_object, "icon_swallow",
@@ -161,12 +158,9 @@
}
_e_fm_icon_type_set(sd);
-
- edje_object_size_min_calc(sd->icon_object, &icon_w, &icon_h);
- printf("INTERNAL SIZE: %d %d\n", icon_w, icon_h);
- //evas_object_resize(sd->icon_object, icon_w, icon_h);
- //evas_object_resize(sd->event_object, icon_w, icon_h);
- //evas_object_resize(sd->obj, icon_w, icon_h);
+ evas_object_resize(sd->icon_object, 64, 64);
+ evas_object_resize(sd->event_object, 64, 64);
+ evas_object_resize(sd->obj, 64, 64);
}
void
@@ -438,7 +432,9 @@
else
e_theme_edje_object_set(sd->image_object, "base/theme/fileman",
"icons/fileman/file");
}
+ evas_object_resize(sd->image_object, sd->iw, sd->ih);
edje_extern_object_min_size_set(sd->image_object, sd->iw, sd->ih);
+ edje_extern_object_max_size_set(sd->image_object, sd->iw, sd->ih);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- e_fileman_smart.c 4 Nov 2005 03:33:22 -0000 1.78
+++ e_fileman_smart.c 4 Nov 2005 14:58:03 -0000 1.79
@@ -491,8 +491,8 @@
if (!sd) return;
sd->object = object;
- sd->icon_info.w = 48;
- sd->icon_info.h = 48;
+ sd->icon_info.w = 64;
+ sd->icon_info.h = 64;
sd->icon_info.x_space = 12;
sd->icon_info.y_space = 10;
@@ -1385,9 +1385,10 @@
icon->file->type = E_FM_FILE_TYPE_DIRECTORY;
icon->icon_object = e_fm_icon_add(sd->evas);
icon->sd = sd;
- e_fm_icon_file_set(icon->icon_object, icon->file);
- e_fm_icon_size_min_calc(icon->icon_object, &w, &h);
- evas_object_resize(icon->icon_object, 64, 64);
+ e_fm_icon_file_set(icon->icon_object, icon->file);
+ //evas_object_resize(icon->icon_object,
+ //sd->icon_info.w,
+ //sd->icon_info.h);
sd->files = evas_list_prepend(sd->files, icon);
}
}
@@ -1402,14 +1403,11 @@
icon = l->data;
- evas_object_resize(icon->icon_object, sd->icon_info.w, sd->icon_info.h);
- //e_fm_icon_image_resize(icon->icon_object, sd->icon_info.w,
sd->icon_info.h);
+ //evas_object_resize(icon->icon_object,
+ // sd->icon_info.w,
+ // sd->icon_info.h);
evas_object_show(icon->icon_object);
- evas_object_geometry_get(icon->icon_object, NULL, NULL, &icon_w,
&icon_h);
- D(("_e_fm_dir_set: Icon, w=%d h=%d\n", icon_w, icon_h));
-
e_icon_layout_pack(sd->layout, icon->icon_object);
-
evas_object_event_callback_add(icon->icon_object,
EVAS_CALLBACK_MOUSE_DOWN, _e_fm_icon_mouse_down_cb, icon);
evas_object_event_callback_add(icon->icon_object,
EVAS_CALLBACK_MOUSE_UP, _e_fm_icon_mouse_up_cb, icon);
evas_object_event_callback_add(icon->icon_object,
EVAS_CALLBACK_MOUSE_IN, _e_fm_icon_mouse_in_cb, icon);
@@ -1480,10 +1478,9 @@
icon->icon_object = e_fm_icon_add(sd->evas);
icon->sd = sd;
e_fm_icon_file_set(icon->icon_object, icon->file);
- e_fm_icon_image_resize(icon->icon_object, sd->icon_info.w,
sd->icon_info.h);
- e_fm_icon_size_min_calc(icon->icon_object, &w, &h);
- printf("icon size: %d %d\n", w, h);
- //evas_object_resize(icon->icon_object, w, h);
+ //evas_object_resize(icon->icon_object,
+ //sd->icon_info.w,
+ //sd->icon_info.h);
files = evas_list_append(files, icon);
}
}
@@ -1561,9 +1558,7 @@
icon->sd = sd;
e_icon_layout_freeze(sd->layout);
e_fm_icon_file_set(icon->icon_object, icon->file);
- //e_fm_icon_image_resize(icon->icon_object, sd->icon_info.w,
sd->icon_info.h);
- e_fm_icon_size_min_calc(icon->icon_object, &w, &h);
- evas_object_resize(icon->icon_object, sd->icon_info.w, sd->icon_info.h);
+ //evas_object_resize(icon->icon_object, sd->icon_info.w,
sd->icon_info.h);
evas_object_show(icon->icon_object);
e_icon_layout_pack(sd->layout, icon->icon_object);
evas_object_event_callback_add(icon->icon_object,
EVAS_CALLBACK_MOUSE_DOWN, _e_fm_icon_mouse_down_cb, icon);
@@ -2427,8 +2422,6 @@
{
char *fullname;
- printf("dir!\n");
-
if (!strcmp(icon->file->name, ".."))
{
fullname = _e_fm_dir_pop(icon->sd->dir);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon_layout.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_icon_layout.c 2 Nov 2005 06:28:52 -0000 1.12
+++ e_icon_layout.c 4 Nov 2005 14:58:03 -0000 1.13
@@ -394,7 +394,7 @@
evas_object_geometry_get(li->obj, NULL, NULL, &li->w, &li->h);
evas_object_move(li->obj, li->x, li->y);
- evas_object_resize(li->obj, li->w, li->h);
+ //evas_object_resize(li->obj, li->w, li->h);
}
static void
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
