summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2015-09-16 01:03:22 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2015-09-16 01:05:13 +0900
commit286ab4d7cf3ca794d88bd06ec027bb2df6401f50 (patch)
treef71bf12ad28dcadb50fd04e3aac1e924575cfaf9
parentb5598d14a9fc90b68f5d631f4b1c8e569188f340 (diff)
focus: Add elm_focus_item.h to make header include order correctly.
This fixes the cpp example compile error which was triggered by the commit 431492e.
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/elm_focus.h62
-rw-r--r--src/lib/elm_focus_item.h61
-rw-r--r--src/lib/elm_object_item.h2
4 files changed, 63 insertions, 63 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index b7ce8b40c..92c44aa0d 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -214,6 +214,7 @@ elm_flipselector.h \
214elm_flipselector_eo.h \ 214elm_flipselector_eo.h \
215elm_flipselector_legacy.h \ 215elm_flipselector_legacy.h \
216elm_focus.h \ 216elm_focus.h \
217elm_focus_item.h \
217elm_font.h \ 218elm_font.h \
218elm_frame.h \ 219elm_frame.h \
219elm_frame_eo.h \ 220elm_frame_eo.h \
diff --git a/src/lib/elm_focus.h b/src/lib/elm_focus.h
index dae26ed7e..46883a715 100644
--- a/src/lib/elm_focus.h
+++ b/src/lib/elm_focus.h
@@ -38,7 +38,7 @@
38 * 38 *
39 * @ingroup Focus 39 * @ingroup Focus
40 */ 40 */
41typedef enum _Elm_Focus_Direction 41typedef enum
42{ 42{
43 ELM_FOCUS_PREVIOUS, /**< previous direction */ 43 ELM_FOCUS_PREVIOUS, /**< previous direction */
44 ELM_FOCUS_NEXT, /**< next direction */ 44 ELM_FOCUS_NEXT, /**< next direction */
@@ -249,47 +249,6 @@ EAPI Evas_Object * elm_object_focus_next_object_get(const Evas_Object *ob
249EAPI void elm_object_focus_next_object_set(Evas_Object *obj, Evas_Object *next, Elm_Focus_Direction dir); 249EAPI void elm_object_focus_next_object_set(Evas_Object *obj, Evas_Object *next, Elm_Focus_Direction dir);
250 250
251/** 251/**
252 * Get next object item which was set with specific focus direction.
253 *
254 * Get next object item which was set by elm_object_focus_next_item_set
255 * with specific focus direction.
256 *
257 * @param obj The Elementary object
258 * @param dir Focus direction
259 * @return Focus next object item or @c NULL, if there is no focus next
260 * object item.
261 *
262 * @see elm_object_focus_next_item_set(), elm_object_focus_next()
263 *
264 * @since 1.16
265 *
266 * @ingroup Focus
267 */
268EAPI Elm_Object_Item * elm_object_focus_next_item_get(const Evas_Object *obj, Elm_Focus_Direction dir);
269
270/**
271 * Set next object item with specific focus direction.
272 *
273 * When focus next object item is set with specific focus direction,
274 * this object item will be the first candidate when finding
275 * next focusable object or item.
276 * If the focus next object item is set, it is preference to focus next object.
277 * Focus next object item can be registered with six directions that are
278 * previous, next, up, down, right, and left.
279 *
280 * @param obj The Elementary object
281 * @param next_item Focus next object item
282 * @param dir Focus direction
283 *
284 * @see elm_object_focus_next_item_get(), elm_object_focus_next()
285 *
286 * @since 1.16
287 *
288 * @ingroup Focus
289 */
290EAPI void elm_object_focus_next_item_set(Evas_Object *obj, Elm_Object_Item *next_item, Elm_Focus_Direction dir);
291
292/**
293 * Get focused object in object tree. 252 * Get focused object in object tree.
294 * 253 *
295 * This function returns current focused object in one object sub-tree. 254 * This function returns current focused object in one object sub-tree.
@@ -372,25 +331,6 @@ EAPI Eina_Bool elm_object_focus_highlight_style_set(Evas_Object *obj, const c
372EAPI const char *elm_object_focus_highlight_style_get(const Evas_Object *obj); 331EAPI const char *elm_object_focus_highlight_style_get(const Evas_Object *obj);
373 332
374/** 333/**
375 * Get the focused object item
376 *
377 * This returns the focused object item.
378 *
379 * @param obj The container object
380 * @return The focused item, or @c NULL if none
381 *
382 * The focused item can be unfocused with function
383 * elm_object_item_focus_set().
384 *
385 * see @elm_object_item_focus_set()
386 * see @elm_object_item_focus_get()
387 *
388 * @ingroup Focus
389 * @since 1.10
390 */
391EAPI Elm_Object_Item *elm_object_focused_item_get(const Evas_Object *obj);
392
393/**
394 * Set the focus movement policy to a given Elementary object. 334 * Set the focus movement policy to a given Elementary object.
395 * 335 *
396 * @param obj The Elementary object to operate on 336 * @param obj The Elementary object to operate on
diff --git a/src/lib/elm_focus_item.h b/src/lib/elm_focus_item.h
new file mode 100644
index 000000000..b8ef68073
--- /dev/null
+++ b/src/lib/elm_focus_item.h
@@ -0,0 +1,61 @@
1/**
2 * Get the focused object item
3 *
4 * This returns the focused object item.
5 *
6 * @param obj The container object
7 * @return The focused item, or @c NULL if none
8 *
9 * The focused item can be unfocused with function
10 * elm_object_item_focus_set().
11 *
12 * see @elm_object_item_focus_set()
13 * see @elm_object_item_focus_get()
14 *
15 * @ingroup Focus
16 * @since 1.10
17 */
18EAPI Elm_Object_Item *elm_object_focused_item_get(const Evas_Object *obj);
19
20/**
21 * Get next object item which was set with specific focus direction.
22 *
23 * Get next object item which was set by elm_object_focus_next_item_set
24 * with specific focus direction.
25 *
26 * @param obj The Elementary object
27 * @param dir Focus direction
28 * @return Focus next object item or @c NULL, if there is no focus next
29 * object item.
30 *
31 * @see elm_object_focus_next_item_set(), elm_object_focus_next()
32 *
33 * @since 1.16
34 *
35 * @ingroup Focus
36 */
37EAPI Elm_Object_Item * elm_object_focus_next_item_get(const Evas_Object *obj, Elm_Focus_Direction dir);
38
39/**
40 * Set next object item with specific focus direction.
41 *
42 * When focus next object item is set with specific focus direction,
43 * this object item will be the first candidate when finding
44 * next focusable object or item.
45 * If the focus next object item is set, it is preference to focus next object.
46 * Focus next object item can be registered with six directions that are
47 * previous, next, up, down, right, and left.
48 *
49 * @param obj The Elementary object
50 * @param next_item Focus next object item
51 * @param dir Focus direction
52 *
53 * @see elm_object_focus_next_item_get(), elm_object_focus_next()
54 *
55 * @since 1.16
56 *
57 * @ingroup Focus
58 */
59EAPI void elm_object_focus_next_item_set(Evas_Object *obj, Elm_Object_Item *next_item, Elm_Focus_Direction dir);
60
61
diff --git a/src/lib/elm_object_item.h b/src/lib/elm_object_item.h
index db788f67c..db1986222 100644
--- a/src/lib/elm_object_item.h
+++ b/src/lib/elm_object_item.h
@@ -5,8 +5,6 @@
5 */ 5 */
6typedef Eo Elm_Object_Item; 6typedef Eo Elm_Object_Item;
7 7
8typedef enum _Elm_Focus_Direction Elm_Focus_Direction;
9
10/** 8/**
11 * @typedef Elm_Object_Item_Signal_Cb 9 * @typedef Elm_Object_Item_Signal_Cb
12 * 10 *