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

unify conf2 button signal code, improve overlay button logic 

SVN revision: 83164
This commit is contained in:
Mike Blumenkrantz 2013-01-23 11:13:36 +00:00
parent b3a9880971
commit 95b4651803
1 changed files with 38 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/modules/conf2/e_conf2.c
View File

@ -24,6 +24,35 @@ static Eina_Bool _event_opt_changed(void *d EINA_UNUSED, int type EINA_UNUSED, E
static void _tag_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); static void _tag_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
static void _opt_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event_info); static void _opt_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event_info);
static void
_buttons_toggle(E_Configure_Option *co, Eina_Bool global)
{
Eina_Bool show;
if (global)
show = !!e_configure_option_changed_list();
else
show = co->changed;
if (show)
{
if (!buttons_visible)
{
elm_layout_signal_emit(layout, "e,action,apply_show", "e");
elm_layout_signal_emit(layout, "e,action,discard_show", "e");
}
buttons_visible = EINA_TRUE;
}
else
{
if (buttons_visible)
{
elm_layout_signal_emit(layout, "e,action,apply_hide", "e");
elm_layout_signal_emit(layout, "e,action,discard_hide", "e");
}
buttons_visible = EINA_FALSE;
}
}
static double static double
_opt_overlay_value_update(E_Configure_Option *co, Evas_Object *obj) _opt_overlay_value_update(E_Configure_Option *co, Evas_Object *obj)
{ {
@ -275,12 +304,7 @@ _reset_cb(void *d EINA_UNUSED)
EINA_LIST_FOREACH(e_configure_option_category_list(), l, cat) EINA_LIST_FOREACH(e_configure_option_category_list(), l, cat)
elm_genlist_item_append(list[0], itc_cats, cat, NULL, 0, _cat_sel, cat); elm_genlist_item_append(list[0], itc_cats, cat, NULL, 0, _cat_sel, cat);
elm_object_disabled_set(back, 1); elm_object_disabled_set(back, 1);
if (!e_configure_option_changed_list()) _buttons_toggle(NULL, EINA_TRUE);
{
elm_layout_signal_emit(layout, "e,action,apply_hide", "e");
elm_layout_signal_emit(layout, "e,action,discard_hide", "e");
buttons_visible = EINA_FALSE;
}
ctx_active->category = NULL; ctx_active->category = NULL;
reset_timer = NULL; reset_timer = NULL;
return EINA_FALSE; return EINA_FALSE;
@ -319,12 +343,7 @@ static void
_apply_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) _apply_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
e_configure_option_apply_all(); e_configure_option_apply_all();
if (buttons_visible) _buttons_toggle(NULL, EINA_TRUE);
{
elm_layout_signal_emit(layout, "e,action,apply_hide", "e");
elm_layout_signal_emit(layout, "e,action,discard_hide", "e");
}
buttons_visible = EINA_FALSE;
} }
static void static void
@ -658,7 +677,7 @@ static void
_opt_overlay_show(E_Configure_Option *co, Elm_Object_Item *it) _opt_overlay_show(E_Configure_Option *co, Elm_Object_Item *it)
{ {
Evas_Object *o, *sl; Evas_Object *o, *sl;
Eina_Bool show = EINA_TRUE; Eina_Bool global = EINA_FALSE, show = EINA_TRUE;
Eina_List *l; Eina_List *l;
double d; double d;
char buf[256]; char buf[256];
@ -821,26 +840,9 @@ _opt_overlay_show(E_Configure_Option *co, Elm_Object_Item *it)
break; break;
default: default:
if (overlay) evas_object_del(overlay); if (overlay) evas_object_del(overlay);
return; global = EINA_TRUE;
}
if (e_configure_option_changed_list())
{
if (!buttons_visible)
{
elm_layout_signal_emit(layout, "e,action,apply_show", "e");
elm_layout_signal_emit(layout, "e,action,discard_show", "e");
}
buttons_visible = EINA_TRUE;
}
else
{
if (buttons_visible)
{
elm_layout_signal_emit(layout, "e,action,apply_hide", "e");
elm_layout_signal_emit(layout, "e,action,discard_hide", "e");
}
buttons_visible = EINA_FALSE;
} }
_buttons_toggle(co, global);
} }
static void static void
@ -1118,43 +1120,12 @@ _event_opt_changed(void *d EINA_UNUSED, int type EINA_UNUSED, E_Event_Configure_
{ {
co = evas_object_data_get(overlay, "config_option"); co = evas_object_data_get(overlay, "config_option");
if (ev->co != co) return ECORE_CALLBACK_RENEW; if (ev->co != co) return ECORE_CALLBACK_RENEW;
if (co->changed) _buttons_toggle(co, EINA_FALSE);
{ if (!co->changed) _opt_item_update(co);
if (!buttons_visible)
{
elm_layout_signal_emit(layout, "e,action,apply_show", "e");
elm_layout_signal_emit(layout, "e,action,discard_show", "e");
}
buttons_visible = EINA_TRUE;
}
else
{
if (buttons_visible)
{
elm_layout_signal_emit(layout, "e,action,apply_hide", "e");
elm_layout_signal_emit(layout, "e,action,discard_hide", "e");
}
buttons_visible = EINA_FALSE;
_opt_item_update(co);
}
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
} }
if (e_configure_option_changed_list()) _buttons_toggle(NULL, EINA_TRUE);
{ if (buttons_visible) return ECORE_CALLBACK_RENEW;
if (!buttons_visible)
{
elm_layout_signal_emit(layout, "e,action,apply_show", "e");
elm_layout_signal_emit(layout, "e,action,discard_show", "e");
}
buttons_visible = EINA_TRUE;
return ECORE_CALLBACK_RENEW;
}
if (buttons_visible)
{
elm_layout_signal_emit(layout, "e,action,apply_hide", "e");
elm_layout_signal_emit(layout, "e,action,discard_hide", "e");
}
buttons_visible = EINA_FALSE;
_opt_item_update(ev->co); _opt_item_update(ev->co);
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
} }