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

oh make custom bg/overlays etc. work again in efm. i know e_icon was 

being used - not quite right as per before. need to look into this.
mental note.



SVN revision: 70695
This commit is contained in:
Carsten Haitzler 2012-05-03 12:13:34 +00:00
parent 89ddff064e
commit af106c4c74
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/modules/fileman/e_fwin.c
View File

@ -470,16 +470,18 @@ _e_fwin_new(E_Container *con,
fwin->pages = eina_list_append(fwin->pages, page); fwin->pages = eina_list_append(fwin->pages, page);
fwin->cur_page = page; fwin->cur_page = page;
o = e_icon_add(e_win_evas_get(fwin->win)); o = edje_object_add(fwin->win->evas);
e_icon_scale_size_set(o, 0); // o = e_icon_add(e_win_evas_get(fwin->win));
e_icon_fill_inside_set(o, 0); // e_icon_scale_size_set(o, 0);
// e_icon_fill_inside_set(o, 0);
edje_object_part_swallow(fwin->bg_obj, "e.swallow.bg", o); edje_object_part_swallow(fwin->bg_obj, "e.swallow.bg", o);
evas_object_pass_events_set(o, 1); evas_object_pass_events_set(o, 1);
fwin->under_obj = o; fwin->under_obj = o;
o = e_icon_add(e_win_evas_get(fwin->win)); o = edje_object_add(fwin->win->evas);
e_icon_scale_size_set(o, 0); // o = e_icon_add(e_win_evas_get(fwin->win));
e_icon_fill_inside_set(o, 0); // e_icon_scale_size_set(o, 0);
// e_icon_fill_inside_set(o, 0);
edje_object_part_swallow(e_scrollframe_edje_object_get(page->scrollframe_obj), "e.swallow.overlay", o); edje_object_part_swallow(e_scrollframe_edje_object_get(page->scrollframe_obj), "e.swallow.overlay", o);
evas_object_pass_events_set(o, 1); evas_object_pass_events_set(o, 1);
fwin->over_obj = o; fwin->over_obj = o;
@ -606,6 +608,7 @@ _e_fwin_page_create(E_Fwin *fwin)
_e_fwin_pan_child_size_get); _e_fwin_pan_child_size_get);
evas_object_propagate_events_set(page->fm_obj, 0); evas_object_propagate_events_set(page->fm_obj, 0);
page->scrollframe_obj = o; page->scrollframe_obj = o;
// edje_object_part_swallow(fwin->bg_obj, "e.swallow.content", o);
evas_object_move(o, 0, 0); evas_object_move(o, 0, 0);
evas_object_show(o); evas_object_show(o);
@ -1251,12 +1254,14 @@ _e_fwin_changed(void *data,
*/ */
snprintf(buf, sizeof(buf), "%s/.directory.desktop", e_fm2_real_path_get(page->fm_obj)); snprintf(buf, sizeof(buf), "%s/.directory.desktop", e_fm2_real_path_get(page->fm_obj));
ef = efreet_desktop_new(buf); ef = efreet_desktop_new(buf);
printf("EF=%p for %s\n", ef, buf);
if (ef) if (ef)
{ {
fwin->wallpaper_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->wallpaper_file, "X-Enlightenment-Directory-Wallpaper"); fwin->wallpaper_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->wallpaper_file, "X-Enlightenment-Directory-Wallpaper");
fwin->overlay_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->overlay_file, "X-Enlightenment-Directory-Overlay"); fwin->overlay_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->overlay_file, "X-Enlightenment-Directory-Overlay");
fwin->scrollframe_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->scrollframe_file, "X-Enlightenment-Directory-Scrollframe"); fwin->scrollframe_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->scrollframe_file, "X-Enlightenment-Directory-Scrollframe");
fwin->theme_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->theme_file, "X-Enlightenment-Directory-Theme"); fwin->theme_file = _e_fwin_custom_file_path_eval(fwin, ef, fwin->theme_file, "X-Enlightenment-Directory-Theme");
printf("fwin->wallpaper_file = %s\n", fwin->wallpaper_file);
efreet_desktop_free(ef); efreet_desktop_free(ef);
} }
else else
@ -1273,29 +1278,32 @@ _e_fwin_changed(void *data,
evas_object_hide(fwin->under_obj); evas_object_hide(fwin->under_obj);
if (fwin->wallpaper_file) if (fwin->wallpaper_file)
{ {
ext = strrchr(fwin->wallpaper_file, '.'); edje_object_file_set(fwin->under_obj, fwin->wallpaper_file, "e/desktop/background");
if (ext && !strcasecmp(ext, ".edj")) // ext = strrchr(fwin->wallpaper_file, '.');
e_icon_file_edje_set(fwin->under_obj, fwin->wallpaper_file, "e/desktop/background"); // if (ext && !strcasecmp(ext, ".edj"))
else // e_icon_file_edje_set(fwin->under_obj, fwin->wallpaper_file, "e/desktop/background");
e_icon_file_set(fwin->under_obj, fwin->wallpaper_file); // else
// e_icon_file_set(fwin->under_obj, fwin->wallpaper_file);
} }
else // else
e_icon_file_edje_set(fwin->under_obj, NULL, NULL); // e_icon_file_edje_set(fwin->under_obj, NULL, NULL);
evas_object_show(fwin->under_obj); evas_object_show(fwin->under_obj);
} }
if (fwin->over_obj) if (fwin->over_obj)
{ {
printf("over obj\n");
evas_object_hide(fwin->over_obj); evas_object_hide(fwin->over_obj);
if (fwin->overlay_file) if (fwin->overlay_file)
{ {
ext = strrchr(fwin->overlay_file, '.'); edje_object_file_set(fwin->over_obj, fwin->overlay_file, "e/desktop/background");
if (ext && !strcasecmp(ext, ".edj")) // ext = strrchr(fwin->overlay_file, '.');
e_icon_file_edje_set(fwin->over_obj, fwin->overlay_file, "e/desktop/background"); // if (ext && !strcasecmp(ext, ".edj"))
else // e_icon_file_edje_set(fwin->over_obj, fwin->overlay_file, "e/desktop/background");
e_icon_file_set(fwin->over_obj, fwin->overlay_file); // else
// e_icon_file_set(fwin->over_obj, fwin->overlay_file);
} }
else // else
e_icon_file_edje_set(fwin->over_obj, NULL, NULL); // e_icon_file_edje_set(fwin->over_obj, NULL, NULL);
evas_object_show(fwin->over_obj); evas_object_show(fwin->over_obj);
} }
if (page->scrollframe_obj) if (page->scrollframe_obj)