From 16a49ed8b8378b2bbe58e8266254d58bb036b6f4 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Tue, 26 Oct 2010 23:21:20 +0000 Subject: [PATCH] - no need to delay showing the list. fixes black area sometimes being visible with current theme - remove unused functions - smaller default geometry SVN revision: 53904 --- src/modules/everything/e_mod_main.c | 5 ++ src/modules/everything/e_mod_main.h | 5 +- src/modules/everything/evry.c | 111 +++++++----------------------------- 3 files changed, 28 insertions(+), 93 deletions(-) diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c index d553310..68fb631 100644 --- a/src/modules/everything/e_mod_main.c +++ b/src/modules/everything/e_mod_main.c @@ -448,6 +448,11 @@ _config_init() pcc->plugins = eina_list_append(pcc->plugins, pc); IFMODCFGEND; + IFMODCFG(0x0002); + evry_conf->width = 365; + evry_conf->height = 360; + IFMODCFGEND; + evry_conf->version = MOD_CONFIG_FILE_VERSION; } diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h index f5d2d8a..a7167fc 100644 --- a/src/modules/everything/e_mod_main.h +++ b/src/modules/everything/e_mod_main.h @@ -5,7 +5,7 @@ #include "evry_api.h" #define MOD_CONFIG_FILE_EPOCH 0x0005 -#define MOD_CONFIG_FILE_GENERATION 0x0001 +#define MOD_CONFIG_FILE_GENERATION 0x0002 #define MOD_CONFIG_FILE_VERSION \ ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) @@ -29,10 +29,7 @@ struct _Evry_Window Eina_Bool request_selection; Eina_Bool plugin_dedicated; - Eina_Bool visible; - Ecore_Timer *show_timer; - Ecore_Timer *hide_timer; Eina_List *handlers; diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index 15d6126..62cc6d9 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -131,49 +131,12 @@ _evry_cb_item_changed(__UNUSED__ void *data, __UNUSED__ int type, void *event) return ECORE_CALLBACK_PASS_ON; } -static Eina_Bool -_cb_show_timer(void *data) -{ - Evry_Window *win = data; - Evry_Selector *sel; - - win->show_timer = NULL; - - _evry_selector_activate(SUBJ_SEL, 0); - sel = CUR_SEL; - - if (sel && sel->state && evry_conf->views) - { - if (evry_conf->first_run) - { - evry_view_toggle(sel->state, "?"); - evry_conf->first_run = EINA_FALSE; - } - - edje_object_signal_emit(win->o_main, "list:e,state,list_show", "e"); - edje_object_signal_emit(win->o_main, "list:e,state,entry_show", "e"); - win->visible = EINA_TRUE; - } - - return ECORE_CALLBACK_CANCEL; -} - -static Eina_Bool -_cb_hide_timer(void *data) -{ - Evry_Window *win = data; - - win->hide_timer = NULL; - evry_hide(win, 0); - - return ECORE_CALLBACK_CANCEL; -} - Evry_Window * evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params) { Evry_Window *win; Ecore_X_Window input_window; + Evry_Selector *sel; E_OBJECT_CHECK_RETURN(zone, 0); E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, 0); @@ -251,15 +214,30 @@ evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params) _evry_selector_plugins_get(SUBJ_SEL, NULL, params); _evry_selector_update(SUBJ_SEL); - if (!evry_conf->hide_input || edge) - edje_object_signal_emit(win->o_main, "list:e,state,entry_show", "e"); + windows = eina_list_append(windows, win); if (!evry_conf->hide_list || edge) - win->show_timer = ecore_timer_add(0.01, _cb_show_timer, win); - else - _evry_selector_activate(SUBJ_SEL, 0); + { + _evry_selector_activate(SUBJ_SEL, 0); + sel = CUR_SEL; - windows = eina_list_append(windows, win); + if (sel && sel->state && evry_conf->views) + { + if (evry_conf->first_run) + { + evry_view_toggle(sel->state, "?"); + evry_conf->first_run = EINA_FALSE; + } + + edje_object_signal_emit(win->o_main, "list:e,state,list_show", "e"); + edje_object_signal_emit(win->o_main, "list:e,state,entry_show", "e"); + win->visible = EINA_TRUE; + } + } + else + { + _evry_selector_activate(SUBJ_SEL, 0); + } return win; } @@ -320,11 +298,6 @@ evry_hide(Evry_Window *win, int clear) return; } - if (win->show_timer) - ecore_timer_del(win->show_timer); - if (win->hide_timer) - ecore_timer_del(win->hide_timer); - win->visible = EINA_FALSE; for (i = 0; win->sel_list[i]; i++) @@ -879,43 +852,6 @@ _evry_cb_drag_finished(E_Drag *drag, int dropped) E_FREE(drag->data); } -#if 0 -static Eina_Bool -_evry_cb_mouse_in(__UNUSED__ void *data, int type, void *event) -{ - Ecore_X_Event_Mouse_In *ev = event; - - if (ev->event_win != input_window) - return ECORE_CALLBACK_PASS_ON; - - e_grabinput_get(input_window, 0, input_window); - - if (win && win->hide_timer) - { - ecore_timer_del(win->hide_timer); - win->hide_timer = NULL; - } - - return ECORE_CALLBACK_PASS_ON; -} - -static Eina_Bool -_evry_cb_mouse_out(__UNUSED__ void *data, __UNUSED__ int type, void *event) -{ - Ecore_X_Event_Mouse_In *ev = event; - - if (!win || (ev->event_win != input_window)) - return ECORE_CALLBACK_PASS_ON; - - if (win->hide_timer) - return ECORE_CALLBACK_PASS_ON; - - win->hide_timer = ecore_timer_add(0.3, _cb_hide_timer, win); - - return ECORE_CALLBACK_PASS_ON; -} -#endif - static Eina_Bool _evry_cb_mouse(void *data, int type, void *event) { @@ -1761,9 +1697,6 @@ evry_selectors_switch(Evry_Window *win, int dir, int slide) { Evry_State *s = (CUR_SEL)->state; - if (win->show_timer) - _cb_show_timer(NULL); - if ((CUR_SEL)->update_timer) { if ((CUR_SEL == SUBJ_SEL) || (CUR_SEL == ACTN_SEL)) -- 2.7.4