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

Ephoto: Don't search when typing in the file selector entry

This commit is contained in:
Stephen Houston 2016-04-01 22:15:26 -05:00
parent 76478ee5ce
commit 1aafc222ef
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/ephoto_single_browser.c
View File

@ -1391,11 +1391,9 @@ _add_edit_menu_items(Ephoto_Single_Browser *sb, Evas_Object *menu)
_zoom_fit_cb, sb); _zoom_fit_cb, sb);
elm_menu_item_add(menu, menu_itt, "zoom-original", _("Zoom 1:1"), elm_menu_item_add(menu, menu_itt, "zoom-original", _("Zoom 1:1"),
_zoom_1_cb, sb); _zoom_1_cb, sb);
elm_menu_item_separator_add(menu, menu_it);
elm_menu_item_add(menu, menu_it, "media-playback-start", _("Slideshow"),
_slideshow, sb);
elm_menu_item_separator_add(menu, NULL); elm_menu_item_separator_add(menu, NULL);
elm_menu_item_add(menu, NULL, "media-playback-start", _("Slideshow"),
_slideshow, sb);
elm_menu_item_add(menu, NULL, "preferences-system", _("Settings"), elm_menu_item_add(menu, NULL, "preferences-system", _("Settings"),
_settings, sb); _settings, sb);
} }

12
src/bin/ephoto_thumb_browser.c
View File

@ -944,8 +944,6 @@ _ephoto_search_cancel(void *data, Evas_Object *obj EINA_UNUSED,
tb->original_grid = NULL; tb->original_grid = NULL;
tb->totimages = tb->totimages_old; tb->totimages = tb->totimages_old;
tb->totsize = tb->totsize_old; tb->totsize = tb->totsize_old;
tb->totimages_old = 0;
tb->totsize_old = 0;
} }
if (!tb->ephoto->entries) if (!tb->ephoto->entries)
{ {
@ -959,6 +957,8 @@ _ephoto_search_cancel(void *data, Evas_Object *obj EINA_UNUSED,
evas_object_del(hbox); evas_object_del(hbox);
tb->searching = 0; tb->searching = 0;
_update_info_label(tb); _update_info_label(tb);
tb->totimages_old = 0;
tb->totsize_old = 0;
} }
static void static void
@ -1956,6 +1956,7 @@ _grid_mouse_up_cb(void *data, Evas *e EINA_UNUSED,
elm_menu_item_separator_add(menu, NULL); elm_menu_item_separator_add(menu, NULL);
elm_menu_item_add(menu, menu_it, "system-search", _("Search"), elm_menu_item_add(menu, menu_it, "system-search", _("Search"),
_search, tb); _search, tb);
elm_menu_item_separator_add(menu, menu_it);
elm_menu_item_add(menu, menu_it, "edit-select-all", _("Select All"), elm_menu_item_add(menu, menu_it, "edit-select-all", _("Select All"),
_grid_menu_select_all_cb, tb); _grid_menu_select_all_cb, tb);
} }
@ -1967,6 +1968,7 @@ _grid_mouse_up_cb(void *data, Evas *e EINA_UNUSED,
{ {
elm_menu_item_add(menu, menu_it, "edit-clear", _("Select None"), elm_menu_item_add(menu, menu_it, "edit-clear", _("Select None"),
_grid_menu_clear_cb, tb); _grid_menu_clear_cb, tb);
elm_menu_item_separator_add(menu, menu_it);
if (item) if (item)
{ {
evas_object_data_set(item, "thumb_browser", tb); evas_object_data_set(item, "thumb_browser", tb);
@ -2002,7 +2004,7 @@ _grid_mouse_up_cb(void *data, Evas *e EINA_UNUSED,
elm_menu_item_add(menu, NULL, "preferences-system", _("Settings"), elm_menu_item_add(menu, NULL, "preferences-system", _("Settings"),
_settings, tb); _settings, tb);
evas_object_smart_callback_add(menu, "dismissed", _menu_dismissed_cb, evas_object_smart_callback_add(menu, "dismissed", _menu_dismissed_cb,
tb); tb);
evas_object_show(menu); evas_object_show(menu);
} }
@ -2014,8 +2016,6 @@ _grid_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
Evas_Event_Mouse_Wheel *ev = event_info; Evas_Event_Mouse_Wheel *ev = event_info;
Eina_Bool ctrl = evas_key_modifier_is_set(ev->modifiers, "Control"); Eina_Bool ctrl = evas_key_modifier_is_set(ev->modifiers, "Control");
printf("No\n");
if (ctrl) if (ctrl)
{ {
if (ev->z > 0) if (ev->z > 0)
@ -2219,6 +2219,8 @@ _key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
else if (ev->compose && (((ev->compose[0] != '\\') else if (ev->compose && (((ev->compose[0] != '\\')
&& (ev->compose[0] >= ' ')) || ev->compose[1])) && (ev->compose[0] >= ' ')) || ev->compose[1]))
{ {
if (elm_object_focus_get(tb->direntry))
return;
if (!tb->searching) if (!tb->searching)
{ {
_search(tb, NULL, NULL); _search(tb, NULL, NULL);