forked from enlightenment/enlightenment
- move init / shutdown calls to their proper locations
- disable _e_fileman_reconf_cb for now as its looping infinitely SVN revision: 17680
This commit is contained in:
parent
c5b05bf0ee
commit
b2041f65b5
|
@ -72,7 +72,7 @@ e_fileman_new(E_Container *con)
|
||||||
e_win_resize_callback_set(fileman->win, _e_fileman_cb_resize);
|
e_win_resize_callback_set(fileman->win, _e_fileman_cb_resize);
|
||||||
e_win_resize(fileman->win, 640, 480);
|
e_win_resize(fileman->win, 640, 480);
|
||||||
|
|
||||||
e_fm_init(); // this needs to move to e's global init
|
evas_event_freeze(fileman->evas);
|
||||||
|
|
||||||
fileman->smart = e_fm_add(fileman->evas);
|
fileman->smart = e_fm_add(fileman->evas);
|
||||||
e_fm_e_win_set(fileman->smart, fileman->win);
|
e_fm_e_win_set(fileman->smart, fileman->win);
|
||||||
|
@ -85,6 +85,8 @@ e_fileman_new(E_Container *con)
|
||||||
ecore_event_handler_add(E_EVENT_FM_RECONFIGURE,
|
ecore_event_handler_add(E_EVENT_FM_RECONFIGURE,
|
||||||
_e_fileman_reconf_cb,
|
_e_fileman_reconf_cb,
|
||||||
fileman));
|
fileman));
|
||||||
|
evas_event_thaw(fileman->evas);
|
||||||
|
|
||||||
return fileman;
|
return fileman;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,6 +128,9 @@ _e_fileman_cb_resize(E_Win *win)
|
||||||
fileman = win->data;
|
fileman = win->data;
|
||||||
evas_object_resize(fileman->main, win->w, win->h);
|
evas_object_resize(fileman->main, win->w, win->h);
|
||||||
e_fm_geometry_virtual_get(fileman->smart, &w, &h);
|
e_fm_geometry_virtual_get(fileman->smart, &w, &h);
|
||||||
|
|
||||||
|
evas_event_freeze(fileman->evas);
|
||||||
|
|
||||||
if (h > win->h)
|
if (h > win->h)
|
||||||
edje_object_part_swallow(fileman->main, "vscrollbar", fileman->vscrollbar);
|
edje_object_part_swallow(fileman->main, "vscrollbar", fileman->vscrollbar);
|
||||||
else
|
else
|
||||||
|
@ -133,6 +138,8 @@ _e_fileman_cb_resize(E_Win *win)
|
||||||
edje_object_part_unswallow(fileman->main, fileman->vscrollbar);
|
edje_object_part_unswallow(fileman->main, fileman->vscrollbar);
|
||||||
evas_object_hide(fileman->vscrollbar);
|
evas_object_hide(fileman->vscrollbar);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
evas_event_thaw(fileman->evas);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -163,6 +170,8 @@ _e_fileman_reconf_cb(void *data, int type, void *event)
|
||||||
fileman = data;
|
fileman = data;
|
||||||
ev = event;
|
ev = event;
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
evas_event_freeze(fileman->evas);
|
evas_event_freeze(fileman->evas);
|
||||||
|
|
||||||
if (ev->h > fileman->win->h)
|
if (ev->h > fileman->win->h)
|
||||||
|
|
|
@ -526,8 +526,6 @@ _e_fm_smart_add(Evas_Object *object)
|
||||||
sd->icon_info.x_space = 15;
|
sd->icon_info.x_space = 15;
|
||||||
sd->icon_info.y_space = 15;
|
sd->icon_info.y_space = 15;
|
||||||
|
|
||||||
e_thumb_init();
|
|
||||||
|
|
||||||
sd->monitor = NULL;
|
sd->monitor = NULL;
|
||||||
sd->file_offset = 0;
|
sd->file_offset = 0;
|
||||||
sd->position = 0;
|
sd->position = 0;
|
||||||
|
@ -653,8 +651,6 @@ _e_fm_smart_del(Evas_Object *object)
|
||||||
|
|
||||||
free(sd->dir);
|
free(sd->dir);
|
||||||
free(sd);
|
free(sd);
|
||||||
|
|
||||||
e_thumb_shutdown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -731,6 +731,8 @@ _e_main_screens_init(void)
|
||||||
if (!e_desk_init()) return 0;
|
if (!e_desk_init()) return 0;
|
||||||
if (!e_gadman_init()) return 0;
|
if (!e_gadman_init()) return 0;
|
||||||
if (!e_menu_init()) return 0;
|
if (!e_menu_init()) return 0;
|
||||||
|
if (!e_thumb_init()) return 0;
|
||||||
|
if (!e_fm_init()) return 0;
|
||||||
|
|
||||||
num = 0;
|
num = 0;
|
||||||
roots = ecore_x_window_root_list(&num);
|
roots = ecore_x_window_root_list(&num);
|
||||||
|
@ -785,6 +787,8 @@ _e_main_screens_init(void)
|
||||||
static int
|
static int
|
||||||
_e_main_screens_shutdown(void)
|
_e_main_screens_shutdown(void)
|
||||||
{
|
{
|
||||||
|
e_fm_shutdown();
|
||||||
|
e_thumb_shutdown();
|
||||||
e_win_shutdown();
|
e_win_shutdown();
|
||||||
e_border_shutdown();
|
e_border_shutdown();
|
||||||
e_focus_shutdown();
|
e_focus_shutdown();
|
||||||
|
|
|
@ -31,7 +31,7 @@ e_thumb_init(void)
|
||||||
int
|
int
|
||||||
e_thumb_shutdown(void)
|
e_thumb_shutdown(void)
|
||||||
{
|
{
|
||||||
free(thumb_path);
|
E_FREE(thumb_path);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue