styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- temp fix until icons are properly done 

SVN revision: 18282
This commit is contained in:
codewarrior 2005-11-04 14:58:03 +00:00 committed by codewarrior
parent 2a5feb1cd0
commit b0cd7dcbec
4 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/themes/default_fileman.edc
View File

@ -25,7 +25,6 @@ group { \
#define FILEMAN_ICON(TYPE) \
group { \
name: "icons/fileman/"TYPE; \
max: 48 48; \
parts { \
part { \
name: "icon"; \
@ -34,7 +33,6 @@ group { \
state: "default" 0.0; \
aspect: 1.0 1.0; \
align: 0.5 0.0; \
max: 48 48; \
image { \
normal: "e17_icon_fileman_"TYPE".png"; \
} \
@ -46,7 +44,6 @@ group { \
#define FILEMAN_ICON_CLICKABLE(TYPE) \
group { \
name: "icons/fileman/"TYPE; \
max: 48 48; \
parts { \
part { \
name: "icon"; \
@ -55,7 +52,6 @@ group { \
state: "default" 0.0; \
align: 0.5 0.0; \
aspect: 1.0 1.0; \
max: 48 48; \
image { \
normal: "e17_icon_fileman_"TYPE".png"; \
} \
@ -64,7 +60,6 @@ group { \
state: "clicked" 0.0; \
align: 0.5 0.0; \
aspect: 1.0 1.0; \
max: 48 48; \
image { \
normal: "e17_icon_fileman_"TYPE"_clicked.png"; \
} \

14
src/bin/e_fileman_icon.c
View File

@ -139,10 +139,7 @@ e_fm_icon_file_set(Evas_Object *obj, E_Fm_File *file)
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_file_set(Evas_Object *obj, E_Fm_File *file)
}
_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 @@ _e_fm_icon_icon_mime_get(E_Smart_Data *sd)
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

33
src/bin/e_fileman_smart.c
View File

@ -491,8 +491,8 @@ _e_fm_smart_add(Evas_Object *object)
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 @@ _e_fm_dir_set(E_Fm_Smart_Data *sd, const char *dir)
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 @@ _e_fm_dir_set(E_Fm_Smart_Data *sd, const char *dir)
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 @@ _e_fm_dir_files_get(E_Fm_Smart_Data *sd, int type)
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 @@ _e_fm_dir_monitor_cb(void *data, Ecore_File_Monitor *ecore_file_monitor,
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 @@ _e_fm_icon_run(E_Fm_Smart_Data *sd)
{
char *fullname;
printf("dir!\n");
if (!strcmp(icon->file->name, ".."))
{
fullname = _e_fm_dir_pop(icon->sd->dir);

2
src/bin/e_icon_layout.c
View File

@ -394,7 +394,7 @@ _e_icon_layout_smart_move_resize_item(E_Icon_Layout_Item *li)
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