diff options
Diffstat (limited to '')
-rw-r--r-- | libraries/edje/src/lib/Edje.h | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/libraries/edje/src/lib/Edje.h b/libraries/edje/src/lib/Edje.h index c8094b4..6413014 100644 --- a/libraries/edje/src/lib/Edje.h +++ b/libraries/edje/src/lib/Edje.h | |||
@@ -377,6 +377,13 @@ part of Edje's API: | |||
377 | @author Sebastian Dransfeld <sd@@tango.flipp.net> | 377 | @author Sebastian Dransfeld <sd@@tango.flipp.net> |
378 | @author Tom Hacohen <tom@@stosb.com> | 378 | @author Tom Hacohen <tom@@stosb.com> |
379 | @author Aharon Hillel <a.hillel@@partner.samsung.com> | 379 | @author Aharon Hillel <a.hillel@@partner.samsung.com> |
380 | @author Shilpa Singh <shilpa.singh@samsung.com> <shilpasingh.o@gmail.com> | ||
381 | @author Mike Blumenkrantz <michael.blumenkrantz@gmail.com | ||
382 | @author Jaehwan Kim <jae.hwan.kim@samsung.com> | ||
383 | @author billiob (Boris Faure) <billiob@gmail.com> | ||
384 | @author Govindaraju SM <govi.sm@samsung.com> <govism@gmail.com> | ||
385 | @author Prince Kumar Dubey <prince.dubey@samsung.com> <prince.dubey@gmail.com> | ||
386 | @author David Seikel <onefang at gmail.com> | ||
380 | 387 | ||
381 | Please contact <enlightenment-devel@lists.sourceforge.net> to get in | 388 | Please contact <enlightenment-devel@lists.sourceforge.net> to get in |
382 | contact with the developers and maintainers. | 389 | contact with the developers and maintainers. |
@@ -472,7 +479,7 @@ extern "C" { | |||
472 | #endif | 479 | #endif |
473 | 480 | ||
474 | #define EDJE_VERSION_MAJOR 1 | 481 | #define EDJE_VERSION_MAJOR 1 |
475 | #define EDJE_VERSION_MINOR 0 | 482 | #define EDJE_VERSION_MINOR 2 |
476 | 483 | ||
477 | typedef struct _Edje_Version | 484 | typedef struct _Edje_Version |
478 | { | 485 | { |
@@ -794,7 +801,7 @@ typedef enum _Edje_External_Param_Flags | |||
794 | EDJE_EXTERNAL_PARAM_FLAGS_STATE) /**< Convenience flag that sets property as GET, SET and STATE. */ | 801 | EDJE_EXTERNAL_PARAM_FLAGS_STATE) /**< Convenience flag that sets property as GET, SET and STATE. */ |
795 | } Edje_External_Param_Flags; | 802 | } Edje_External_Param_Flags; |
796 | 803 | ||
797 | typedef enum | 804 | typedef enum _Edje_Input_Panel_Layout |
798 | { | 805 | { |
799 | EDJE_INPUT_PANEL_LAYOUT_NORMAL, /**< Default layout */ | 806 | EDJE_INPUT_PANEL_LAYOUT_NORMAL, /**< Default layout */ |
800 | EDJE_INPUT_PANEL_LAYOUT_NUMBER, /**< Number layout */ | 807 | EDJE_INPUT_PANEL_LAYOUT_NUMBER, /**< Number layout */ |
@@ -804,7 +811,10 @@ typedef enum | |||
804 | EDJE_INPUT_PANEL_LAYOUT_IP, /**< IP layout */ | 811 | EDJE_INPUT_PANEL_LAYOUT_IP, /**< IP layout */ |
805 | EDJE_INPUT_PANEL_LAYOUT_MONTH, /**< Month layout */ | 812 | EDJE_INPUT_PANEL_LAYOUT_MONTH, /**< Month layout */ |
806 | EDJE_INPUT_PANEL_LAYOUT_NUMBERONLY, /**< Number Only layout */ | 813 | EDJE_INPUT_PANEL_LAYOUT_NUMBERONLY, /**< Number Only layout */ |
807 | EDJE_INPUT_PANEL_LAYOUT_INVALID | 814 | EDJE_INPUT_PANEL_LAYOUT_INVALID, /**< Never use this */ |
815 | EDJE_INPUT_PANEL_LAYOUT_HEX, /**< Hexadecimal layout @since 1.2 */ | ||
816 | EDJE_INPUT_PANEL_LAYOUT_TERMINAL, /**< Command-line terminal layout @since 1.2 */ | ||
817 | EDJE_INPUT_PANEL_LAYOUT_PASSWORD /**< Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */ | ||
808 | } Edje_Input_Panel_Layout; | 818 | } Edje_Input_Panel_Layout; |
809 | 819 | ||
810 | /** | 820 | /** |
@@ -1650,8 +1660,21 @@ EAPI void edje_box_layout_register (const char *name, Evas_Object | |||
1650 | * } | 1660 | * } |
1651 | * | 1661 | * |
1652 | * @endcode | 1662 | * @endcode |
1663 | * | ||
1664 | * @note You can get a callback every time edje re-calculates the object | ||
1665 | * (either due to animation or some kind of signal or input). This is called | ||
1666 | * in-line just after the recalculation has occured. It is a good idea not | ||
1667 | * to go and delete or alter the object inside this callbacks, simply make | ||
1668 | * a note that the recalculation has taken place and then do somethnig about | ||
1669 | * it outside the callback. to register a callback use code like: | ||
1670 | * | ||
1671 | * @code | ||
1672 | * evas_object_smart_callback_add(edje_obj, "recalc", my_cb, my_cb_data); | ||
1673 | * @endcode | ||
1674 | * | ||
1675 | * @see evas_object_smart_callback_add() | ||
1653 | * | 1676 | * |
1654 | * @note before creating the first Edje object in your code, remember | 1677 | * @note Before creating the first Edje object in your code, remember |
1655 | * to initialize the library, with edje_init(), or unexpected behavior | 1678 | * to initialize the library, with edje_init(), or unexpected behavior |
1656 | * might occur. | 1679 | * might occur. |
1657 | */ | 1680 | */ |
@@ -2757,12 +2780,15 @@ EAPI Eina_Bool edje_object_part_text_cursor_is_visible_format_get(const E | |||
2757 | /** | 2780 | /** |
2758 | * @brief Returns the content (char) at the cursor position. | 2781 | * @brief Returns the content (char) at the cursor position. |
2759 | * @see evas_textblock_cursor_content_get | 2782 | * @see evas_textblock_cursor_content_get |
2783 | * | ||
2784 | * You must free the return (if not NULL) after you are done with it. | ||
2760 | * | 2785 | * |
2761 | * @param obj A valid Evas_Object handle | 2786 | * @param obj A valid Evas_Object handle |
2762 | * @param part The part name | 2787 | * @param part The part name |
2763 | * @param cur The cursor to use | 2788 | * @param cur The cursor to use |
2789 | * @return The character string pointed to (may be a multi-byte utf8 sequence) terminated by a nul byte. | ||
2764 | */ | 2790 | */ |
2765 | EAPI const char *edje_object_part_text_cursor_content_get (const Evas_Object *obj, const char *part, Edje_Cursor cur); | 2791 | EAPI char *edje_object_part_text_cursor_content_get (const Evas_Object *obj, const char *part, Edje_Cursor cur); |
2766 | 2792 | ||
2767 | /** | 2793 | /** |
2768 | * @brief Sets the cursor position to the given value | 2794 | * @brief Sets the cursor position to the given value |
@@ -2941,7 +2967,9 @@ EAPI Eina_Bool edje_object_part_swallow (Evas_Object *obj, const c | |||
2941 | * | 2967 | * |
2942 | * Causes the edje to regurgitate a previously swallowed object. :) | 2968 | * Causes the edje to regurgitate a previously swallowed object. :) |
2943 | * | 2969 | * |
2944 | * @note @p obj_swallow will @b not be deleted. | 2970 | * @note @p obj_swallow will @b not be deleted or hidden. |
2971 | * @note @p obj_swallow may appear shown on the evas depending on its state when | ||
2972 | * it got unswallowed. Make sure you delete it or hide it if you do not want it to. | ||
2945 | */ | 2973 | */ |
2946 | EAPI void edje_object_part_unswallow (Evas_Object *obj, Evas_Object *obj_swallow); | 2974 | EAPI void edje_object_part_unswallow (Evas_Object *obj, Evas_Object *obj_swallow); |
2947 | 2975 | ||