summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-08-12 08:58:28 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-08-12 09:14:45 +0900
commited83237fb4ef62557f627b7cced1c3e80b33af99 (patch)
tree6c681641b5c3990081a649076e99deaf61f1bffa
parentf906009c8354572a857a75ad431e7caea265f2e1 (diff)
downloadefl-ed83237fb4ef62557f627b7cced1c3e80b33af99.tar.gz
image: Remove all new EAPI that shouldn't exist
Remove EAPI symbols and functions that were wrongfully added: - elm_image_scale_down_set - elm_image_scale_down_get - elm_image_scale_up_set - elm_image_scale_up_get - elm_image_fill_inside_set - elm_image_fill_inside_get - elm_image_scale_get - elm_image_scale_set Fixes T4343 @fix
-rw-r--r--src/lib/elementary/efl_ui_image.c99
-rw-r--r--src/lib/elementary/efl_ui_image.eo12
-rw-r--r--src/lib/elementary/elm_icon.c2
-rw-r--r--src/lib/elementary/elm_image_legacy.h118
-rw-r--r--src/lib/elementary/elm_priv.h2
5 files changed, 2 insertions, 231 deletions
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 9ca46329e5..2417c173f7 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1764,29 +1764,6 @@ elm_image_memfile_set(Evas_Object *obj, const void *img, size_t size, const char
return EINA_TRUE;
}
-// TODO: use the widget's scale value instead of image's scale value.
-
-EAPI void
-elm_image_scale_set(Evas_Object *obj,
- double scale)
-{
- EFL_UI_IMAGE_CHECK(obj);
- EFL_UI_IMAGE_DATA_GET(obj, sd);
-
- sd->scale = scale;
-
- _efl_ui_image_internal_sizing_eval(obj, sd);
-}
-
-EAPI double
-elm_image_scale_get(const Evas_Object *obj)
-{
- EFL_UI_IMAGE_CHECK(obj) -1;
- EFL_UI_IMAGE_DATA_GET(obj, sd);
-
- return sd->scale;
-}
-
EAPI void
elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside)
{
@@ -1921,52 +1898,6 @@ elm_image_object_size_get(const Evas_Object *obj, int *w, int *h)
}
EAPI void
-elm_image_scale_down_set(Evas_Object *obj, Eina_Bool scale_down)
-{
- EFL_UI_IMAGE_CHECK(obj);
- EFL_UI_IMAGE_DATA_GET(obj, sd);
-
- scale_down = !!scale_down;
-
- if (sd->scale_down == scale_down) return;
-
- sd->scale_down = scale_down;
-
- _efl_ui_image_internal_sizing_eval(obj, sd);
-}
-
-EAPI Eina_Bool
-elm_image_scale_down_get(const Evas_Object *obj)
-{
- EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
- EFL_UI_IMAGE_DATA_GET(obj, sd);
- return sd->scale_down;
-}
-
-EAPI void
-elm_image_scale_up_set(Evas_Object *obj, Eina_Bool scale_up)
-{
- EFL_UI_IMAGE_CHECK(obj);
- EFL_UI_IMAGE_DATA_GET(obj, sd);
-
- scale_up = !!scale_up;
-
- if (sd->scale_up == scale_up) return;
-
- sd->scale_up = scale_up;
-
- _efl_ui_image_internal_sizing_eval(obj, sd);
-}
-
-EAPI Eina_Bool
-elm_image_scale_up_get(const Evas_Object *obj)
-{
- EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
- EFL_UI_IMAGE_DATA_GET(obj, sd);
- return sd->scale_up;
-}
-
-EAPI void
elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale)
{
EFL_UI_IMAGE_CHECK(obj);
@@ -2005,36 +1936,6 @@ elm_image_resizable_get(const Evas_Object *obj, Eina_Bool *size_up, Eina_Bool *s
}
EAPI void
-elm_image_fill_inside_set(Evas_Object *obj, Eina_Bool fill_inside)
-{
- EFL_UI_IMAGE_CHECK(obj);
- EFL_UI_IMAGE_DATA_GET(obj, sd);
- fill_inside = !!fill_inside;
-
- if (sd->fill_inside == fill_inside) return;
-
- sd->fill_inside = fill_inside;
-
- if (sd->aspect_fixed)
- {
- if (sd->fill_inside) sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_INSIDE;
- else sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_OUTSIDE;
- }
- else
- sd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FILL;
-
- _efl_ui_image_sizing_eval(obj);
-}
-
-EAPI Eina_Bool
-elm_image_fill_inside_get(const Evas_Object *obj)
-{
- EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
- EFL_UI_IMAGE_DATA_GET(obj, sd);
- return sd->fill_inside;
-}
-
-EAPI void
elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed)
{
EFL_UI_IMAGE_CHECK(obj);
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 3b9a8ef7af..2fb32a1fa1 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -53,10 +53,6 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
[[Control how the internal image is scaled.
@since 1.18]]
- set {
- }
- get {
- }
values {
scale_type: Efl.Ui.Image.Scale_Type;
}
@@ -65,10 +61,6 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
[[Enable or disable scaling up or down the internal image.
@since 1.18]]
- set {
- }
- get {
- }
values {
scale_up: bool; [[If $true, the internal image might be scaled up
if necessary according to the scale type.
@@ -84,10 +76,6 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
[[Control how the internal image is positioned inside an image object.
@since 1.18]]
- set {
- }
- get {
- }
values {
align_x: double; [[Alignment in the horizontal axis (0 <= align_x <= 1).]]
align_y: double; [[Alignment in the vertical axis (0 <= align_y <= 1).]]
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 0d2f274129..3546020e28 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -441,7 +441,7 @@ _internal_elm_icon_standard_set(Evas_Object *obj,
if (ret)
{
eina_stringshare_replace(&sd->stdicon, name);
- _elm_image_sizing_eval(obj);
+ _efl_ui_image_sizing_eval(obj);
return EINA_TRUE;
}
diff --git a/src/lib/elementary/elm_image_legacy.h b/src/lib/elementary/elm_image_legacy.h
index 2cd9b99c71..49f37596c8 100644
--- a/src/lib/elementary/elm_image_legacy.h
+++ b/src/lib/elementary/elm_image_legacy.h
@@ -327,28 +327,6 @@ EAPI Eina_Bool elm_image_editable_get(const Evas_Object *obj);
EAPI Eina_Bool elm_image_memfile_set(Evas_Object *obj, const void *img, size_t size, const char *format, const char *key);
/**
- * @brief Control the scale of the object's image.
- *
- * @param[in] scale Object's image scale.
- *
- * @since 1.7
- *
- * @ingroup Elm_Image
- */
-EAPI void elm_image_scale_set(Evas_Object *obj, double scale);
-
-/**
- * @brief Control the scale of the object's image.
- *
- * @return Object's image scale.
- *
- * @since 1.7
- *
- * @ingroup Elm_Image
- */
-EAPI double elm_image_scale_get(const Evas_Object *obj);
-
-/**
* @brief Control if the image fills the entire object area, when keeping the
* aspect ratio.
*
@@ -361,8 +339,6 @@ EAPI double elm_image_scale_get(const Evas_Object *obj);
* @note This option will have no effect if @ref elm_image_aspect_fixed_get is
* set to @c false.
*
- * See also @ref Elm.Image.fill_inside.
- *
* @param[in] fill_outside @c true if the object is filled outside, @c false
* otherwise. Default is @c false.
*
@@ -383,8 +359,6 @@ EAPI void elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
* @note This option will have no effect if @ref elm_image_aspect_fixed_get is
* set to @c false.
*
- * See also @ref Elm.Image.fill_inside.
- *
* @return @c true if the object is filled outside, @c false otherwise. Default
* is @c false.
*
@@ -475,54 +449,6 @@ EAPI Evas_Object *elm_image_object_get(const Evas_Object *obj);
EAPI void elm_image_object_size_get(const Evas_Object *obj, int *w, int *h);
/**
- * @brief Control whether the object's image can be resized to a size smaller
- * than the original one.
- *
- * @param[in] resize_down whether resizing down is allowed
- *
- * @since 1.7
- *
- * @ingroup Elm_Image
- */
-EAPI void elm_image_resize_down_set(Evas_Object *obj, Eina_Bool resize_down);
-
-/**
- * @brief Control whether the object's image can be resized to a size smaller
- * than the original one.
- *
- * @return whether resizing down is allowed
- *
- * @since 1.7
- *
- * @ingroup Elm_Image
- */
-EAPI Eina_Bool elm_image_resize_down_get(const Evas_Object *obj);
-
-/**
- * @brief Control whether the object's image can be resized to a size larget
- * than the original one.
- *
- * @param[in] resize_up whether resizing up is allowed
- *
- * @since 1.7
- *
- * @ingroup Elm_Image
- */
-EAPI void elm_image_resize_up_set(Evas_Object *obj, Eina_Bool resize_up);
-
-/**
- * @brief Control whether the object's image can be resized to a size larget
- * than the original one.
- *
- * @return whether resizing up is allowed
- *
- * @since 1.7
- *
- * @ingroup Elm_Image
- */
-EAPI Eina_Bool elm_image_resize_up_get(const Evas_Object *obj);
-
-/**
* @brief Control if the object is (up/down) resizable.
*
* This function limits the image resize ability. If @c size_up is set to
@@ -585,50 +511,6 @@ EAPI void elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
EAPI Eina_Bool elm_image_no_scale_get(const Evas_Object *obj);
/**
- * @brief Control if the whole image is inside the object area
- * when keeping the aspect ratio.
- *
- * If the image should keep its aspect ratio when the object is resized to another
- * aspect ratio, there are two possibilities to scale the image: keep the entire
- * image inside the limits of height and width of the object ($fill_inside is
- * @c true) or let the extra width or height go outside of the object, and the
- * image will fill the entire object ($fill_inside is @c false).
- *
- * @note This option will have no effect if @ref elm_image_aspect_fixed_get is
- * set to @c false.
- *
- * See also @ref Elm.Image.fill_outside.
- *
- * @param[in] fill_inside @c true if the whole image is inside the object area,
- * @c false otherwise. Default is @c true.
- *
- * @ingroup Elm_Image
- */
-EAPI void elm_image_fill_inside_set(Evas_Object *obj, Eina_Bool fill_inside);
-
-/**
- * @brief Get whether the whole image is inside the object area or not
- * when keeping the aspect ratio.
- *
- * If the image should keep its aspect ratio when the object is resized to another
- * aspect ratio, there are two possibilities to scale the image: keep the entire
- * image inside the limits of height and width of the object ($fill_inside is
- * @c true) or let the extra width or height go outside of the object, and the
- * image will fill the entire object ($fill_inside is @c false).
- *
- * @note This option will have no effect if @ref elm_image_aspect_fixed_get is
- * set to @c false.
- *
- * See also @ref Elm.Image.fill_outside.
- *
- * return @c true if the whole image is inside the object area,
- * @c false otherwise. Default is @c true.
- *
- * @ingroup Elm_Image
- */
-EAPI Eina_Bool elm_image_fill_inside_get(const Evas_Object *obj);
-
-/**
* @brief Control whether the internal image's aspect ratio
* is fixed to the original image's aspect ratio
*
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 8f17ac65c3..53a1d5b5e2 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -544,7 +544,7 @@ void *_elm_icon_signal_callback_del(Evas_Object *obj,
const char *emission,
const char *source,
Edje_Signal_Cb func_cb);
- void _elm_image_sizing_eval(Evas_Object *obj);
+ void _efl_ui_image_sizing_eval(Evas_Object *obj);
/* end of DEPRECATED */