enlightenment/ephoto
enlightenment
/
ephoto
7
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Ephoto: No reason to block window with popup on directory load.

This commit is contained in:
Stephen okra Houston 2015-12-15 12:39:46 -06:00
parent ecdc0457a4
commit 598e33f646
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/ephoto_thumb_browser.c
View File

@ -31,7 +31,6 @@ struct _Ephoto_Thumb_Browser
Evas_Object *max; Evas_Object *max;
Evas_Object *leftbox; Evas_Object *leftbox;
Evas_Object *direntry; Evas_Object *direntry;
Evas_Object *dir_loading;
Evas_Object *ficon; Evas_Object *ficon;
Elm_Object_Item *dir_current; Elm_Object_Item *dir_current;
Elm_Object_Item *last_sel; Elm_Object_Item *last_sel;
@ -417,13 +416,7 @@ _todo_items_process(void *data)
{ {
if (tb->animator.count == 0) if (tb->animator.count == 0)
return EINA_TRUE; return EINA_TRUE;
if (tb->dir_loading) tb->animator.todo_items = NULL;
{
evas_object_del(tb->dir_loading);
evas_object_freeze_events_set(tb->main, EINA_FALSE);
elm_object_focus_set(tb->main, EINA_TRUE);
}
tb->animator.todo_items = NULL;
return EINA_FALSE; return EINA_FALSE;
} }
if ((tb->ls) && (eina_list_count(tb->todo_items) < TODO_ITEM_MIN_BATCH)) if ((tb->ls) && (eina_list_count(tb->todo_items) < TODO_ITEM_MIN_BATCH))
@ -3105,10 +3098,6 @@ _ephoto_thumb_populate_start(void *data, int type EINA_UNUSED,
evas_object_smart_callback_call(tb->main, "changed,directory", NULL); evas_object_smart_callback_call(tb->main, "changed,directory", NULL);
tb->dir_loading =
_processing(tb, _("Loading Directory"),
_("Please wait while the directory is loaded."));
evas_object_show(tb->dir_loading);
tb->animator.processed = 0; tb->animator.processed = 0;
tb->animator.count = 0; tb->animator.count = 0;
@ -3189,12 +3178,6 @@ _ephoto_thumb_populate_end(void *data, int type EINA_UNUSED,
tb->totimages), _("Size"), isize); tb->totimages), _("Size"), isize);
elm_object_text_set(tb->infolabel, image_info); elm_object_text_set(tb->infolabel, image_info);
} }
if (tb->dir_loading && (tb->animator.processed == tb->animator.count))
{
evas_object_del(tb->dir_loading);
evas_object_freeze_events_set(tb->main, EINA_FALSE);
elm_object_focus_set(tb->main, EINA_TRUE);
}
tb->dirs_only = 0; tb->dirs_only = 0;
tb->thumbs_only = 0; tb->thumbs_only = 0;
@ -3207,12 +3190,6 @@ _ephoto_thumb_populate_error(void *data, int type EINA_UNUSED,
{ {
Ephoto_Thumb_Browser *tb = data; Ephoto_Thumb_Browser *tb = data;
if (tb->dir_loading)
{
evas_object_del(tb->dir_loading);
evas_object_freeze_events_set(tb->main, EINA_FALSE);
elm_object_focus_set(tb->main, EINA_TRUE);
}
tb->dirs_only = 0; tb->dirs_only = 0;
tb->thumbs_only = 0; tb->thumbs_only = 0;