summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2015-07-06 18:50:26 +0300
committerYakov Goldberg <yakov.g@samsung.com>2015-07-08 10:23:38 +0300
commite91ab22df00b2355980d24d337bf9a7e97d89902 (patch)
treea837c2fef597315e172193771148381c0f11754b
parentbe020ff3572df298540d21b7d6a83abc9f2387fb (diff)
downloadelementary-e91ab22df00b2355980d24d337bf9a7e97d89902.tar.gz
elm_bg: Move enums to elm_bg.eo
Move enums from elm_bg_common.h to elm_bg.eo in order to make them more accessible for bindings. Delete elm_bg_common.h.
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/elm_bg.eo19
-rw-r--r--src/lib/elm_bg.h1
-rw-r--r--src/lib/elm_bg_common.h26
4 files changed, 18 insertions, 29 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 1011a3ef6..01452b664 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -155,7 +155,6 @@ elm_authors.h \
elm_bg.h \
elm_bg_eo.h \
elm_bg_legacy.h \
-elm_bg_common.h \
elm_box.h \
elm_box_eo.h \
elm_box_legacy.h \
diff --git a/src/lib/elm_bg.eo b/src/lib/elm_bg.eo
index 8dc66b2dc..5ecff8e59 100644
--- a/src/lib/elm_bg.eo
+++ b/src/lib/elm_bg.eo
@@ -1,3 +1,20 @@
+enum Elm.Bg.Option
+{
+ [[
+ @addtogroup Bg
+ Identifiers on how a background widget is to display its image --
+ if it was set to use an image file.
+
+ @see elm_bg_option_set()
+ @see elm_bg_option_get()
+ ]]
+ center, [[Center the background image.]]
+ scale, [[Scale the background image, retaining aspect ratio (default).]]
+ stretch, [[Stretch the background image to fill the widget's area.]]
+ tile, [[Tile background image at its original size.]]
+ last [[Sentinel value, also used to indicate errors.]]
+}
+
class Elm.Bg (Elm.Layout, Efl.File)
{
eo_prefix: elm_obj_bg;
@@ -28,7 +45,7 @@ class Elm.Bg (Elm.Layout, Efl.File)
@ingroup Bg */
}
values {
- option: Elm_Bg_Option; /*@ The desired background option (see #Elm_Bg_Option) */
+ option: Elm.Bg.Option; /*@ The desired background option (see #Elm_Bg_Option) */
}
}
@property color {
diff --git a/src/lib/elm_bg.h b/src/lib/elm_bg.h
index 4fc0fbb58..b41a96d05 100644
--- a/src/lib/elm_bg.h
+++ b/src/lib/elm_bg.h
@@ -29,7 +29,6 @@
* @li @ref bg_03_example_page
*/
-#include "elm_bg_common.h"
#ifdef EFL_EO_API_SUPPORT
#include "elm_bg_eo.h"
#endif
diff --git a/src/lib/elm_bg_common.h b/src/lib/elm_bg_common.h
deleted file mode 100644
index 7c770dc78..000000000
--- a/src/lib/elm_bg_common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @addtogroup Bg
- *
- * @{
- */
-
-/**
- * Identifiers on how a background widget is to display its image --
- * if it was set to use an image file.
- *
- * @see elm_bg_option_set()
- * @see elm_bg_option_get()
- */
-typedef enum
-{
- ELM_BG_OPTION_CENTER, /**< center the background image */
- ELM_BG_OPTION_SCALE, /**< scale the background image, retaining aspect ratio (default)*/
- ELM_BG_OPTION_STRETCH, /**< stretch the background image to fill the widget's area */
- ELM_BG_OPTION_TILE, /**< tile background image at its original size */
- ELM_BG_OPTION_LAST /**< sentinel value, also used to indicate errors */
-} Elm_Bg_Option;
-
-
-/**
- * @}
- */