From bbdb3c7b051a93fb5714d9ba3e44af781a4ff910 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 27 Jun 2012 11:28:30 +0000 Subject: [PATCH] use e,state,focused for syscon focus signals since other themes support these SVN revision: 72940 --- data/themes/default.edc | 4 ++-- src/modules/syscon/e_syscon.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index b97780cd1..1391954ce 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -16916,7 +16916,7 @@ collections { programs { program { name: "focus_in"; - signal: "e,focus,in"; + signal: "e,state,focused"; source: "e"; action: STATE_SET "clicked" 0.0; target: "button_image"; @@ -16930,7 +16930,7 @@ collections { } program { name: "focus_out"; - signal: "e,focus,out"; + signal: "e,state,unfocused"; source: "e"; action: STATE_SET "default" 0.0; target: "button_image"; diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c index 652c9818c..9f1c7caaf 100644 --- a/src/modules/syscon/e_syscon.c +++ b/src/modules/syscon/e_syscon.c @@ -356,7 +356,7 @@ _cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event) } else { - edje_object_signal_emit(o_selected, "e,focus,out", "e"); + edje_object_signal_emit(o_selected, "e,state,focused", "e"); o_selected = e_flowlayout_pack_object_prev(o_selected_flow, o_selected); if (!o_selected) { @@ -380,7 +380,7 @@ _cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event) } } } - edje_object_signal_emit(o_selected, "e,focus,in", "e"); + edje_object_signal_emit(o_selected, "e,state,unfocused", "e"); } else if ((!strcmp(ev->key, "Right")) || (!strcmp(ev->key, "Down")) || (!strcmp(ev->key, "Tab"))) { @@ -388,7 +388,7 @@ _cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event) o_selected_flow = o_flow_main, o_selected = e_flowlayout_pack_object_first(o_flow_main); else { - edje_object_signal_emit(o_selected, "e,focus,out", "e"); + edje_object_signal_emit(o_selected, "e,state,focused", "e"); o_selected = e_flowlayout_pack_object_next(o_selected_flow, o_selected); if (!o_selected) { @@ -412,12 +412,12 @@ _cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event) } } } - edje_object_signal_emit(o_selected, "e,focus,in", "e"); + edje_object_signal_emit(o_selected, "e,state,unfocused", "e"); } else if ((!strcmp(ev->keyname, "KP_Enter")) || (!strcmp(ev->keyname, "Return"))) { if (!o_selected) return ECORE_CALLBACK_RENEW; - edje_object_signal_emit(o_selected, "e,focus,out", "e"); + edje_object_signal_emit(o_selected, "e,state,focused", "e"); edje_object_signal_emit(o_selected, "e,action,click", ""); o_selected = o_selected_flow = NULL; }