From 40a27407e7ebaa4f3fcf5748342c32c81f8f8a3c Mon Sep 17 00:00:00 2001 From: Yakov Goldberg Date: Mon, 6 Jul 2015 12:21:26 +0300 Subject: [PATCH] elm_ctxpopup: Move enums to elm_ctxpopup.eo Move enums from elc_ctxpopup_common.h to elm_ctxpopup.eo in order to make them more accessible for bindings. Delete elc_ctxpopup_common.h. --- src/lib/Makefile.am | 1 - src/lib/elc_ctxpopup.h | 1 - src/lib/elc_ctxpopup_common.h | 9 --------- src/lib/elm_ctxpopup.eo | 25 +++++++++++++++++++------ 4 files changed, 19 insertions(+), 17 deletions(-) delete mode 100644 src/lib/elc_ctxpopup_common.h diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 1b573ff..c863d74 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -111,7 +111,6 @@ includesub_HEADERS = \ elc_ctxpopup.h \ elc_ctxpopup_eo.h \ elc_ctxpopup_legacy.h \ -elc_ctxpopup_common.h \ elc_fileselector.h \ elc_fileselector_eo.h \ elc_fileselector_legacy.h \ diff --git a/src/lib/elc_ctxpopup.h b/src/lib/elc_ctxpopup.h index 1ad3de2..67cebb1 100644 --- a/src/lib/elc_ctxpopup.h +++ b/src/lib/elc_ctxpopup.h @@ -60,7 +60,6 @@ * @{ */ -#include "elc_ctxpopup_common.h" #ifdef EFL_EO_API_SUPPORT #include "elc_ctxpopup_eo.h" #endif diff --git a/src/lib/elc_ctxpopup_common.h b/src/lib/elc_ctxpopup_common.h deleted file mode 100644 index d4a26fb..0000000 --- a/src/lib/elc_ctxpopup_common.h +++ /dev/null @@ -1,9 +0,0 @@ -typedef enum -{ - ELM_CTXPOPUP_DIRECTION_DOWN, /**< ctxpopup show appear below clicked area */ - ELM_CTXPOPUP_DIRECTION_RIGHT, /**< ctxpopup show appear to the right of the clicked area */ - ELM_CTXPOPUP_DIRECTION_LEFT, /**< ctxpopup show appear to the left of the clicked area */ - ELM_CTXPOPUP_DIRECTION_UP, /**< ctxpopup show appear above the clicked area */ - ELM_CTXPOPUP_DIRECTION_UNKNOWN, /**< ctxpopup does not determine it's direction yet*/ -} Elm_Ctxpopup_Direction; /**< Direction in which to show the popup */ - diff --git a/src/lib/elm_ctxpopup.eo b/src/lib/elm_ctxpopup.eo index 38d8e5d..e10a2e0 100644 --- a/src/lib/elm_ctxpopup.eo +++ b/src/lib/elm_ctxpopup.eo @@ -1,3 +1,16 @@ +enum Elm.Ctxpopup.Direction +{ + [[ + @ingroup Ctxpopup + Direction in which to show the popup. + ]] + down, [[Ctxpopup show appear below clicked area.]] + right, [[Ctxpopup show appear to the right of the clicked area.]] + left, [[Ctxpopup show appear to the left of the clicked area.]] + up, [[Ctxpopup show appear above the clicked area.]] + unknown [[Ctxpopup does not determine it's direction yet.]] +} + class Elm.Ctxpopup (Elm.Layout, Elm_Interface_Atspi_Widget_Action) { eo_prefix: elm_obj_ctxpopup; @@ -92,7 +105,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm_Interface_Atspi_Widget_Action) showing direction. This doesn't guarantee the ctxpopup will appear in the requested direction. - @see Elm_Ctxpopup_Direction + @see Elm.Ctxpopup.Direction @ingroup Ctxpopup */ } @@ -105,10 +118,10 @@ class Elm.Ctxpopup (Elm.Layout, Elm_Interface_Atspi_Widget_Action) @ingroup Ctxpopup */ } values { - first: Elm_Ctxpopup_Direction; /*@ 1st priority of direction */ - second: Elm_Ctxpopup_Direction; /*@ 2nd priority of direction */ - third: Elm_Ctxpopup_Direction; /*@ 3th priority of direction */ - fourth: Elm_Ctxpopup_Direction; /*@ 4th priority of direction */ + first: Elm.Ctxpopup.Direction; /*@ 1st priority of direction */ + second: Elm.Ctxpopup.Direction; /*@ 2nd priority of direction */ + third: Elm.Ctxpopup.Direction; /*@ 3th priority of direction */ + fourth: Elm.Ctxpopup.Direction; /*@ 4th priority of direction */ } } @property direction { @@ -122,7 +135,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm_Interface_Atspi_Widget_Action) @warning Once the ctxpopup showed up, the direction would be determined @ingroup Ctxpopup */ - return: Elm_Ctxpopup_Direction(4); + return: Elm.Ctxpopup.Direction(Elm.Ctxpopup.Direction.unknown); } } @property items { -- 2.7.4