diff options
| author | Larry <larry.olj@gmail.com> | 2016-02-10 19:53:27 -0200 |
|---|---|---|
| committer | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2016-02-22 10:38:26 -0300 |
| commit | ee28ce8c3bfb250890a2ac3c0bbe3e57e5a7ab66 (patch) | |
| tree | 10803c23461475ef9f8e92fe2237c010c0ac9c9c | |
| parent | a3bf6e4270d3b169c19055694f8c6f440068dab3 (diff) | |
| download | elementary-ee28ce8c3bfb250890a2ac3c0bbe3e57e5a7ab66.tar.gz | |
elm.Image: use eolian eva.images enum values in elm_image.eo and remove unused elm_image_common.h
| -rw-r--r-- | src/lib/Makefile.am | 1 | ||||
| -rw-r--r-- | src/lib/elm_image.eo | 25 | ||||
| -rw-r--r-- | src/lib/elm_image.h | 1 | ||||
| -rw-r--r-- | src/lib/elm_image_common.h | 26 |
4 files changed, 23 insertions, 30 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 40fb59746..7ea2597f6 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -253,7 +253,6 @@ elm_icon.h \ elm_icon_eo.h \ elm_icon_legacy.h \ elm_image.h \ -elm_image_common.h \ elm_image_eo.h \ elm_image_legacy.h \ elm_index.h \ diff --git a/src/lib/elm_image.eo b/src/lib/elm_image.eo index c16599cc7..dada8c5f1 100644 --- a/src/lib/elm_image.eo +++ b/src/lib/elm_image.eo @@ -1,4 +1,25 @@ -type Elm.Image.Orient: Evas_Image_Orient; [[Using Evas_Image_Orient enums. @since 1.14]] +import evas_image; + +enum Elm.Image_Orient +{ + [[ + Using Evas_Image_Orient enums. + @since 1.14 + ]] + legacy: elm_image; + orient_none = Evas.Image_Orient.orient_none, + orient_0 = Evas.Image_Orient.orient_0, + rotate_90 = Evas.Image_Orient.orient_90, + orient_90 = Evas.Image_Orient.orient_90, + rotate_180 = Evas.Image_Orient.orient_180, + orient_180 = Evas.Image_Orient.orient_180, + rotate_270 = Evas.Image_Orient.orient_270, + orient_270 = Evas.Image_Orient.orient_270, + flip_horizontal = Evas.Image_Orient.flip_horizontal, + flip_vertical = Evas.Image_Orient.flip_vertical, + flip_transpose = Evas.Image_Orient.flip_transpose, + flip_transverse = Evas.Image_Orient.flip_transverse +} struct Elm.Image.Progress { @@ -161,7 +182,7 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface, get { } values { - orient: Elm.Image.Orient; [[The image orientation Elm.Image.Orient Default is #ELM_IMAGE_ORIENT_NONE.]] + orient: Elm.Image_Orient; [[The image orientation Elm.Image.Orient Default is #ELM_IMAGE_ORIENT_NONE.]] } } @property fill_outside { diff --git a/src/lib/elm_image.h b/src/lib/elm_image.h index 2041ab1b5..c14dc23a4 100644 --- a/src/lib/elm_image.h +++ b/src/lib/elm_image.h @@ -41,7 +41,6 @@ * @{ */ -#include <elm_image_common.h> #ifdef EFL_EO_API_SUPPORT #include <elm_image_eo.h> #endif diff --git a/src/lib/elm_image_common.h b/src/lib/elm_image_common.h deleted file mode 100644 index 8e670cbb2..000000000 --- a/src/lib/elm_image_common.h +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @addtogroup Image - * - * @{ - */ - -/** - * Using Evas_Image_Orient enums - * @since 1.14 - */ -#define ELM_IMAGE_ORIENT_NONE EVAS_IMAGE_ORIENT_NONE -#define ELM_IMAGE_ORIENT_0 EVAS_IMAGE_ORIENT_0 -#define ELM_IMAGE_ROTATE_90 EVAS_IMAGE_ORIENT_90 -#define ELM_IMAGE_ORIENT_90 EVAS_IMAGE_ORIENT_90 -#define ELM_IMAGE_ROTATE_180 EVAS_IMAGE_ORIENT_180 -#define ELM_IMAGE_ORIENT_180 EVAS_IMAGE_ORIENT_180 -#define ELM_IMAGE_ROTATE_270 EVAS_IMAGE_ORIENT_270 -#define ELM_IMAGE_ORIENT_270 EVAS_IMAGE_ORIENT_270 -#define ELM_IMAGE_FLIP_HORIZONTAL EVAS_IMAGE_FLIP_HORIZONTAL -#define ELM_IMAGE_FLIP_VERTICAL EVAS_IMAGE_FLIP_VERTICAL -#define ELM_IMAGE_FLIP_TRANSPOSE EVAS_IMAGE_FLIP_TRANSPOSE -#define ELM_IMAGE_FLIP_TRANSVERSE EVAS_IMAGE_FLIP_TRANSVERSE - -/** - * @} - */ |