seoz pushed a commit to branch master.
commit b4e4fffe68a778c99df2da5523e1433070efc387
Author: Daniel Juyung Seo <[email protected]>
Date: Mon Jun 10 14:12:51 2013 +0900
elm: added more "focused" and "unfocused" documentations.
genlist, hover, index, list, map, photocam, progressbar, radio, scroller,
slider, slideshow, spinner, toolbar, win.
---
src/lib/elm_genlist.c | 2 ++
src/lib/elm_genlist.h | 2 ++
src/lib/elm_hover.c | 2 ++
src/lib/elm_hover.h | 2 ++
src/lib/elm_index.c | 2 ++
src/lib/elm_index.h | 2 ++
src/lib/elm_list.c | 2 ++
src/lib/elm_list.h | 2 ++
src/lib/elm_map.c | 2 ++
src/lib/elm_map.h | 2 ++
src/lib/elm_photocam.c | 2 ++
src/lib/elm_photocam.h | 2 ++
src/lib/elm_progressbar.c | 2 ++
src/lib/elm_progressbar.h | 2 ++
src/lib/elm_radio.c | 2 ++
src/lib/elm_radio.h | 2 ++
src/lib/elm_scroller.c | 2 ++
src/lib/elm_scroller.h | 2 ++
src/lib/elm_slider.c | 2 ++
src/lib/elm_slider.h | 2 ++
src/lib/elm_slideshow.c | 2 ++
src/lib/elm_slideshow.h | 2 ++
src/lib/elm_spinner.c | 2 ++
src/lib/elm_spinner.h | 2 ++
src/lib/elm_toolbar.c | 2 ++
src/lib/elm_toolbar.h | 2 ++
src/lib/elm_win.c | 10 ++++++++--
src/lib/elm_win.h | 6 ++++--
28 files changed, 64 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index ffb2cda..a15f8b5 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -135,6 +135,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
{
{SIG_LANG_CHANGED, ""},
{SIG_PRESSED, ""},
{SIG_RELEASED, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_genlist.h b/src/lib/elm_genlist.h
index 97495ef..34b41e7 100644
--- a/src/lib/elm_genlist.h
+++ b/src/lib/elm_genlist.h
@@ -367,6 +367,8 @@
* when the user releases an item or keyboard selection is moved so the item
* is physically unhighlighted. The %c event_info parameter is the item that
* was unhighlighted.
+ * - @c "focused" - When the genlist has received focus. (since 1.8)
+ * - @c "unfocused" - When the genlist has lost focus. (since 1.8)
*
*
* Supported elm_object_item common APIs
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 99343d3..2d166bd 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -49,6 +49,8 @@ static const char SIG_SMART_LOCATION_CHANGED[] =
"smart,changed";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CLICKED, ""},
{SIG_SMART_LOCATION_CHANGED, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_hover.h b/src/lib/elm_hover.h
index e1e684d..db37590 100644
--- a/src/lib/elm_hover.h
+++ b/src/lib/elm_hover.h
@@ -35,6 +35,8 @@
* @li @c "clicked" - the user clicked the empty space in the hover to dismiss
* @li @c "smart,changed" - a content object placed under the "smart"
* policy was replaced to a new slot direction.
+ * @li @c "focused" - When the hover has received focus. (since 1.8)
+ * @li @c "unfocused" - When the hover has lost focus. (since 1.8)
*
* Default content parts of the hover widget that you can use for are:
* @li @c "left"
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 97bd6fd..d46d154 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -31,6 +31,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_LEVEL_UP, ""},
{SIG_LEVEL_DOWN, ""},
{SIG_LANG_CHANGED, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_index.h b/src/lib/elm_index.h
index db06cd9..f522060 100644
--- a/src/lib/elm_index.h
+++ b/src/lib/elm_index.h
@@ -41,6 +41,8 @@
* - @c "level,down" - when the user moves a finger from the second
* level to the first level
* - @c "language,changed" - the program's language changed
+ * - @c "focused" - When the index has received focus. (since 1.8)
+ * - @c "unfocused" - When the index has lost focus. (since 1.8)
*
* The @c "delay,changed" event is so that it'll wait a small time
* before actually reporting those events and, moreover, just the
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 5f487dd..cdd4307 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -41,6 +41,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_SWIPE, ""},
{SIG_HIGHLIGHTED, ""},
{SIG_UNHIGHLIGHTED, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_list.h b/src/lib/elm_list.h
index a8c11d7..fa33779 100644
--- a/src/lib/elm_list.h
+++ b/src/lib/elm_list.h
@@ -45,6 +45,8 @@
* is physically unhighlighted. The %c event_info parameter is the item that
* was unhighlighted.
* - @c "language,changed" - the program's language changed
+ * - @c "focused" - When the list has received focus. (since 1.8)
+ * - @c "unfocused" - When the list has lost focus. (since 1.8)
*
* Available styles for it are:
* - @c "default"
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 53f6b1d..a6d41b8 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -338,6 +338,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
{
{SIG_OVERLAY_CLICKED, ""},
{SIG_OVERLAY_DEL, ""},
{SIG_LANG_CHANGED, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_map.h b/src/lib/elm_map.h
index 3c2d538..b37ad36 100644
--- a/src/lib/elm_map.h
+++ b/src/lib/elm_map.h
@@ -50,6 +50,8 @@
* - @c "overlay,clicked" - A overlay is clicked.
* - @c "loaded" - when a map is finally loaded. @since 1.7
* - @c "language,changed" - the program's language changed
+ * - @c "focused" - When the map has received focus. (since 1.8)
+ * - @c "unfocused" - When the map has lost focus. (since 1.8)
*
* Available style for map widget:
* - @c "default"
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 019bacb..c20b129 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -62,6 +62,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_SCROLL_ANIM_STOP, ""},
{SIG_SCROLL_DRAG_START, ""},
{SIG_SCROLL_DRAG_STOP, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_photocam.h b/src/lib/elm_photocam.h
index 80d6eea..cdfc46b 100644
--- a/src/lib/elm_photocam.h
+++ b/src/lib/elm_photocam.h
@@ -39,6 +39,8 @@
* @li @c "scroll,anim,stop" - scrolling animation has stopped
* @li @c "scroll,drag,start" - dragging the contents around has started
* @li @c "scroll,drag,stop" - dragging the contents around has stopped
+ * @li @c "focused" - When the photocam has received focus. (since 1.8)
+ * @li @c "unfocused" - When the photocam has lost focus. (since 1.8)
*
* This widget implements the @b @ref elm-scrollable-interface
* interface, so that all (non-deprecated) functions for the base @ref
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 757868f..d28fa68 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -23,6 +23,8 @@ static const char SIG_CHANGED[] = "changed";
* ones coming from elm layout): */
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_progressbar.h b/src/lib/elm_progressbar.h
index 797716c..5a10201 100644
--- a/src/lib/elm_progressbar.h
+++ b/src/lib/elm_progressbar.h
@@ -37,6 +37,8 @@
* @ref Layout:
* @li @c "changed" - when the value is changed
* @since 1.7
+ * @li @c "focused" - When the progressbar has received focus. (since 1.8)
+ * @li @c "unfocused" - When the progressbar has lost focus. (since 1.8)
*
* This widget has the following styles:
* - @c "default"
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 0b3d69f..9cb20d7 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -29,6 +29,8 @@ static const Elm_Layout_Part_Alias_Description
_text_aliases[] =
static const char SIG_CHANGED[] = "changed";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_radio.h b/src/lib/elm_radio.h
index fec468c..c7fa3a6 100644
--- a/src/lib/elm_radio.h
+++ b/src/lib/elm_radio.h
@@ -40,6 +40,8 @@
* @ref Layout:
* @li changed - This is called whenever the user changes the state of one of
* the radio objects within the group of radio objects that work together.
+ * @li @c "focused" - When the radio has received focus. (since 1.8)
+ * @li @c "unfocused" - When the radio has lost focus. (since 1.8)
*
* Default text parts of the radio widget that you can use for are:
* @li "default" - Label of the radio
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 99d843e..2f121de 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -58,6 +58,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
{SIG_HBAR_PRESS, ""},
{SIG_HBAR_UNPRESS, ""},
{SIG_SCROLL_PAGE_CHANGE, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_scroller.h b/src/lib/elm_scroller.h
index fa052bc..8b2781a 100644
--- a/src/lib/elm_scroller.h
+++ b/src/lib/elm_scroller.h
@@ -36,6 +36,8 @@
* @li @c "hbar,press" - the horizontal scroll bar has been pressed
* @li @c "hbar,unpress" - the horizontal scroll bar has been unpressed
* @li @c "scroll,page,changed" - the visible page has changed
+ * @li @c "focused" - When the scroller has received focus. (since 1.8)
+ * @li @c "unfocused" - When the scroller has lost focus. (since 1.8)
*
* This widget implements the @ref elm-scrollable-interface interface.
* Its (non-deprecated) API functions, except for elm_scroller_add(),
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 4193afd..ceebda0 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -37,6 +37,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_DELAY_CHANGED, ""},
{SIG_DRAG_START, ""},
{SIG_DRAG_STOP, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_slider.h b/src/lib/elm_slider.h
index aea35b1..ee8ed13 100644
--- a/src/lib/elm_slider.h
+++ b/src/lib/elm_slider.h
@@ -42,6 +42,8 @@
* a very short period or when they release their
* finger/mouse, so it avoids possibly expensive reactions to
* the value change.
+ * - @c "focused" - When the slider has received focus. (since 1.8)
+ * - @c "unfocused" - When the slider has lost focus. (since 1.8)
*
* Available styles for it:
* - @c "default"
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 1820a12..c5c4525 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -19,6 +19,8 @@ static const char SIG_TRANSITION_END[] = "transition,end";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
{SIG_TRANSITION_END, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_slideshow.h b/src/lib/elm_slideshow.h
index 08746c6..a99855a 100644
--- a/src/lib/elm_slideshow.h
+++ b/src/lib/elm_slideshow.h
@@ -57,6 +57,8 @@
* item. event_info parameter in callback contains the current visible item
* - @c "transition,end" - when a slide transition ends. event_info parameter
* in callback contains the current visible item
+ * - @c "focused" - When the slideshow has received focus. (since 1.8)
+ * - @c "unfocused" - When the slideshow has lost focus. (since 1.8)
*
* List of examples for the slideshow widget:
* @li @ref slideshow_example
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 1a8a622..0afd7ac 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -24,6 +24,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
{SIG_DELAY_CHANGED, ""},
{SIG_LANG_CHANGED, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_spinner.h b/src/lib/elm_spinner.h
index 3f7a0a8..8393f3f 100644
--- a/src/lib/elm_spinner.h
+++ b/src/lib/elm_spinner.h
@@ -32,6 +32,8 @@
* for a very short period or when they release their finger/mouse,
* so it avoids possibly expensive reactions to the value change.
* - @c "language,changed" - the program's language changed
+ * - @c "focused" - When the spinner has received focus. (since 1.8)
+ * - @c "unfocused" - When the spinner has lost focus. (since 1.8)
*
* Available styles for it:
* - @c "default";
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index db23414..2c34289 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -25,6 +25,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_LONGPRESSED, ""},
{SIG_CLICKED_DOUBLE, ""},
{SIG_LANG_CHANGED, ""},
+ {"focused", ""}, /**< handled by elm_widget */
+ {"unfocused", ""}, /**< handled by elm_widget */
{NULL, NULL}
};
diff --git a/src/lib/elm_toolbar.h b/src/lib/elm_toolbar.h
index 8bc7d6d..0ad69e5 100644
--- a/src/lib/elm_toolbar.h
+++ b/src/lib/elm_toolbar.h
@@ -29,6 +29,8 @@
* - @c "longpressed" - when the toolbar is pressed for a certain
* amount of time.
* - @c "language,changed" - when the program language changes.
+ * - @c "focused" - When the toolbar has received focus. (since 1.8)
+ * - @c "unfocused" - When the toolbar has lost focus. (since 1.8)
*
* Available styles for it:
* - @c "default"
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 90b76c5..256a838 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -164,8 +164,8 @@ struct _Elm_Win_Smart_Data
};
static const char SIG_DELETE_REQUEST[] = "delete,request";
-static const char SIG_FOCUS_OUT[] = "focus,out";
-static const char SIG_FOCUS_IN[] = "focus,in";
+static const char SIG_FOCUS_OUT[] = "focus,out"; // deprecated. use "focused"
instead.
+static const char SIG_FOCUS_IN[] = "focus,in"; // deprecated. use "unfocused"
instead.
static const char SIG_MOVED[] = "moved";
static const char SIG_WITHDRAWN[] = "withdrawn";
static const char SIG_ICONIFIED[] = "iconified";
@@ -180,6 +180,8 @@ static const char SIG_IOERR[] = "ioerr";
static const char SIG_INDICATOR_PROP_CHANGED[] = "indicator,prop,changed";
static const char SIG_ROTATION_CHANGED[] = "rotation,changed";
static const char SIG_PROFILE_CHANGED[] = "profile,changed";
+static const char SIG_FOCUSED[] = "focused";
+static const char SIG_UNFOCUSED[] = "unfocused";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_DELETE_REQUEST, ""},
@@ -199,6 +201,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
{
{SIG_INDICATOR_PROP_CHANGED, ""},
{SIG_ROTATION_CHANGED, ""},
{SIG_PROFILE_CHANGED, ""},
+ {SIG_FOCUSED, ""},
+ {SIG_UNFOCUSED, ""},
{NULL, NULL}
};
@@ -832,6 +836,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
else
elm_widget_focus_restore(obj);
evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL);
+ evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL);
sd->focus_highlight.cur.visible = EINA_TRUE;
_elm_win_focus_highlight_reconfigure_job_start(sd);
if (sd->frame_obj)
@@ -858,6 +863,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
elm_object_focus_set(obj, EINA_FALSE);
_elm_widget_top_win_focused_set(obj, EINA_FALSE);
evas_object_smart_callback_call(obj, SIG_FOCUS_OUT, NULL);
+ evas_object_smart_callback_call(obj, SIG_UNFOCUSED, NULL);
sd->focus_highlight.cur.visible = EINA_FALSE;
_elm_win_focus_highlight_reconfigure_job_start(sd);
if (sd->frame_obj)
diff --git a/src/lib/elm_win.h b/src/lib/elm_win.h
index 28f9740..f231ae7 100644
--- a/src/lib/elm_win.h
+++ b/src/lib/elm_win.h
@@ -70,8 +70,8 @@
*
* @li "delete,request": the user requested to close the window. See
* elm_win_autodel_set().
- * @li "focus,in": window got focus
- * @li "focus,out": window lost focus
+ * @li "focus,in": window got focus (deprecated. use "focused" instead.)
+ * @li "focus,out": window lost focus (deprecated. use "unfocused" instead.)
* @li "moved": window that holds the canvas was moved
* @li "withdrawn": window is still managed normally but removed from view
* @li "iconified": window is minimized (perhaps into an icon or taskbar)
@@ -86,6 +86,8 @@
* @li "indicator,prop,changed": an indicator's property has been changed
* @li "rotation,changed": window rotation has been changed
* @li "profile,changed": profile of the window has been changed
+ * @li "focused" : When the win has received focus. (since 1.8)
+ * @li "unfocused" : When the win has lost focus. (since 1.8)
*
* Examples:
* @li @ref win_example_01
--
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
