From 7b71bd19737ceb3ef027a7a7ca157aa8a2e96237 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Sun, 9 Jun 2013 18:54:43 +0900 Subject: [PATCH] ctxpopup, fileselector_button, naviframe, player, popup, bubble, button: added "focused" and "unfocused" documentations. --- legacy/elementary/src/lib/elc_ctxpopup.c | 4 ++++ legacy/elementary/src/lib/elc_ctxpopup.h | 2 ++ .../src/lib/elc_fileselector_button.c | 4 ++++ legacy/elementary/src/lib/elc_naviframe.c | 5 ++++ legacy/elementary/src/lib/elc_naviframe.h | 2 ++ legacy/elementary/src/lib/elc_player.c | 5 ++++ legacy/elementary/src/lib/elc_popup.c | 5 ++++ legacy/elementary/src/lib/elc_popup.h | 2 ++ legacy/elementary/src/lib/elm_bubble.c | 16 ++++++++----- legacy/elementary/src/lib/elm_bubble.h | 2 ++ legacy/elementary/src/lib/elm_button.c | 24 +++++++++++-------- legacy/elementary/src/lib/elm_button.h | 2 ++ 12 files changed, 57 insertions(+), 16 deletions(-) diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index 2a6a8152b3..fac2231e19 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -17,10 +17,14 @@ EAPI const char ELM_CTXPOPUP_SMART_NAME[] = "elm_ctxpopup"; static const char SIG_DISMISSED[] = "dismissed"; static const char SIG_LANG_CHANGED[] = "language,changed"; +static const char SIG_FOCUSED[] = "focused"; /**< handled by elm_widget */ +static const char SIG_UNFOCUSED[] = "unfocused"; /**< handled by elm_widget */ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_DISMISSED, ""}, {SIG_LANG_CHANGED, ""}, + {SIG_FOCUSED, ""}, + {SIG_UNFOCUSED, ""}, {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elc_ctxpopup.h b/legacy/elementary/src/lib/elc_ctxpopup.h index f9f692e7d3..7309ada6ea 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.h +++ b/legacy/elementary/src/lib/elc_ctxpopup.h @@ -30,6 +30,8 @@ * dismissed. * - @c "language,changed" - This is called when the program's language is * changed. + * - @c "focused" - When the entry has received focus. + * - @c "unfocused" - When the entry has lost focus. * * Default content parts of the ctxpopup widget that you can use for are: * @li "default" - A content of the ctxpopup diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c index 20c506494c..b68c7d6151 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.c +++ b/legacy/elementary/src/lib/elc_fileselector_button.c @@ -16,10 +16,14 @@ EAPI Eo_Op ELM_OBJ_FILESELECTOR_BUTTON_BASE_ID = EO_NOOP; static const char SIG_FILE_CHOSEN[] = "file,chosen"; static const char SIG_LANG_CHANGED[] = "language,changed"; +static const char SIG_FOCUSED[] = "focused"; /**< handled by elm_widget */ +static const char SIG_UNFOCUSED[] = "unfocused"; /**< handled by elm_widget */ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_FILE_CHOSEN, "s"}, {SIG_LANG_CHANGED, ""}, + {SIG_FOCUSED, ""}, + {SIG_UNFOCUSED, ""}, {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index d59c82039b..483b86faa4 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -23,9 +23,14 @@ static const char TITLE_ACCESS_PART[] = "access.title"; static const char SIG_TRANSITION_FINISHED[] = "transition,finished"; static const char SIG_TITLE_CLICKED[] = "title,clicked"; +static const char SIG_FOCUSED[] = "focused"; /**< handled by elm_widget */ +static const char SIG_UNFOCUSED[] = "unfocused"; /**< handled by elm_widget */ + static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_TRANSITION_FINISHED, ""}, {SIG_TITLE_CLICKED, ""}, + {SIG_FOCUSED, ""}, + {SIG_UNFOCUSED, ""}, {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elc_naviframe.h b/legacy/elementary/src/lib/elc_naviframe.h index 3e21340aa6..744d9f38d4 100644 --- a/legacy/elementary/src/lib/elc_naviframe.h +++ b/legacy/elementary/src/lib/elc_naviframe.h @@ -58,6 +58,8 @@ * @li @c "transition,finished" - When the transition is finished in * changing the item * @li @c "title,clicked" - User clicked title area + * @li @c "focused" - When the entry has received focus. + * @li @c "unfocused" - When the entry has lost focus. * * All the parts, for content and text, described here will also be * reachable by naviframe @b items direct calls: diff --git a/legacy/elementary/src/lib/elc_player.c b/legacy/elementary/src/lib/elc_player.c index 8aed1f9a19..0ef5734cef 100644 --- a/legacy/elementary/src/lib/elc_player.c +++ b/legacy/elementary/src/lib/elc_player.c @@ -25,6 +25,9 @@ static const char SIG_PLAY_CLICKED[] = "play,clicked"; static const char SIG_PREV_CLICKED[] = "prev,clicked"; static const char SIG_REWIND_CLICKED[] = "rewind,clicked"; static const char SIG_STOP_CLICKED[] = "stop,clicked"; +static const char SIG_FOCUSED[] = "focused"; /**< handled by elm_widget */ +static const char SIG_UNFOCUSED[] = "unfocused"; /**< handled by elm_widget */ + static const Evas_Smart_Cb_Description _smart_callbacks[] = { { SIG_FORWARD_CLICKED, "" }, { SIG_INFO_CLICKED, "" }, @@ -34,6 +37,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { { SIG_PREV_CLICKED, "" }, { SIG_REWIND_CLICKED, "" }, { SIG_STOP_CLICKED, "" }, + {SIG_FOCUSED, ""}, + {SIG_UNFOCUSED, ""}, { NULL, NULL } }; diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c index 3d2acbc550..766bc5a86f 100644 --- a/legacy/elementary/src/lib/elc_popup.c +++ b/legacy/elementary/src/lib/elc_popup.c @@ -22,9 +22,14 @@ static const char CONTENT_PART[] = "elm.swallow.content"; static const char SIG_BLOCK_CLICKED[] = "block,clicked"; static const char SIG_TIMEOUT[] = "timeout"; +static const char SIG_FOCUSED[] = "focused"; /**< handled by elm_widget */ +static const char SIG_UNFOCUSED[] = "unfocused"; /**< handled by elm_widget */ + static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_BLOCK_CLICKED, ""}, {SIG_TIMEOUT, ""}, + {SIG_FOCUSED, ""}, + {SIG_UNFOCUSED, ""}, {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elc_popup.h b/legacy/elementary/src/lib/elc_popup.h index a1f37bfcc0..c8456e0053 100644 --- a/legacy/elementary/src/lib/elc_popup.h +++ b/legacy/elementary/src/lib/elc_popup.h @@ -70,6 +70,8 @@ * @ref Layout: * @li @c "timeout" - whenever popup is closed as a result of timeout. * @li @c "block,clicked" - whenever user taps on Blocked Event area. + * @li @c "focused" - When the entry has received focus. + * @li @c "unfocused" - When the entry has lost focus. * * Styles available for Popup * @li "default" diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c index a1094f1e6a..4d9f3a8714 100644 --- a/legacy/elementary/src/lib/elm_bubble.c +++ b/legacy/elementary/src/lib/elm_bubble.c @@ -14,6 +14,16 @@ EAPI Eo_Op ELM_OBJ_BUBBLE_BASE_ID = EO_NOOP; #define MY_CLASS_NAME "elm_bubble" static const char SIG_CLICKED[] = "clicked"; +static const char SIG_FOCUSED[] = "focused"; /**< handled by elm_widget */ +static const char SIG_UNFOCUSED[] = "unfocused"; /**< handled by elm_widget */ + +static const Evas_Smart_Cb_Description _smart_callbacks[] = +{ + {SIG_CLICKED, ""}, + {SIG_FOCUSED, ""}, + {SIG_UNFOCUSED, ""}, + {NULL, NULL} +}; static const Elm_Layout_Part_Alias_Description _content_aliases[] = { @@ -29,12 +39,6 @@ static const Elm_Layout_Part_Alias_Description _text_aliases[] = {NULL, NULL} }; -static const Evas_Smart_Cb_Description _smart_callbacks[] = -{ - {SIG_CLICKED, ""}, - {NULL, NULL} -}; - static const char *corner_string[] = { "top_left", diff --git a/legacy/elementary/src/lib/elm_bubble.h b/legacy/elementary/src/lib/elm_bubble.h index ebf53122a5..825fd492ea 100644 --- a/legacy/elementary/src/lib/elm_bubble.h +++ b/legacy/elementary/src/lib/elm_bubble.h @@ -38,6 +38,8 @@ * This widget emits the following signals, besides the ones sent from * @ref Layout: * @li @c "clicked" - This is called when a user has clicked the bubble. + * @li @c "focused" - When the entry has received focus. + * @li @c "unfocused" - When the entry has lost focus. * * Default content parts of the bubble that you can use for are: * @li "default" - A content of the bubble diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c index ddd96ff8ff..51e9c31cdb 100644 --- a/legacy/elementary/src/lib/elm_button.c +++ b/legacy/elementary/src/lib/elm_button.c @@ -17,6 +17,20 @@ static const char SIG_CLICKED[] = "clicked"; static const char SIG_REPEATED[] = "repeated"; static const char SIG_PRESSED[] = "pressed"; static const char SIG_UNPRESSED[] = "unpressed"; +static const char SIG_FOCUSED[] = "focused"; /**< handled by elm_widget */ +static const char SIG_UNFOCUSED[] = "unfocused"; /**< handled by elm_widget */ + +/* smart callbacks coming from elm button objects (besides the ones + * coming from elm layout): */ +static const Evas_Smart_Cb_Description _smart_callbacks[] = { + {SIG_CLICKED, ""}, + {SIG_REPEATED, ""}, + {SIG_PRESSED, ""}, + {SIG_UNPRESSED, ""}, + {SIG_FOCUSED, ""}, + {SIG_UNFOCUSED, ""}, + {NULL, NULL} +}; static const Elm_Layout_Part_Alias_Description _content_aliases[] = { @@ -30,16 +44,6 @@ static const Elm_Layout_Part_Alias_Description _text_aliases[] = {NULL, NULL} }; -/* smart callbacks coming from elm button objects (besides the ones - * coming from elm layout): */ -static const Evas_Smart_Cb_Description _smart_callbacks[] = { - {SIG_CLICKED, ""}, - {SIG_REPEATED, ""}, - {SIG_PRESSED, ""}, - {SIG_UNPRESSED, ""}, - {NULL, NULL} -}; - static void _activate(Evas_Object *obj) { diff --git a/legacy/elementary/src/lib/elm_button.h b/legacy/elementary/src/lib/elm_button.h index 1b80dde4e1..ce0ead99aa 100644 --- a/legacy/elementary/src/lib/elm_button.h +++ b/legacy/elementary/src/lib/elm_button.h @@ -24,6 +24,8 @@ * @li "repeated": the user pressed the button without releasing it. * @li "pressed": button was pressed. * @li "unpressed": button was released after being pressed. + * @li @c "focused" : When the entry has received focus. + * @li @c "unfocused" : When the entry has lost focus. * In all cases, the @c event parameter of the callback will be * @c NULL. *