enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

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

Doing this before the 1.18.x release announcement.

Fixes T4343
@fix
This commit is contained in:
Jean-Philippe Andre 2016-08-12 08:58:28 +09:00
parent c6bb29c4e4
commit 4e00d5a71f
5 changed files with 2 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/lib/elementary/efl_ui_image.c
View File

@ -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)
{
@ -1920,52 +1897,6 @@ elm_image_object_size_get(const Evas_Object *obj, int *w, int *h)
efl_gfx_view_size_get(obj, w, 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)
{
@ -2004,36 +1935,6 @@ elm_image_resizable_get(const Evas_Object *obj, Eina_Bool *size_up, Eina_Bool *s
if (size_down) *size_down = sd->scale_down;
}
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)
{

12
src/lib/elementary/efl_ui_image.eo
View File

@ -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).]]

2
src/lib/elementary/elm_icon.c
View File

@ -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;
}

118
src/lib/elementary/elm_image_legacy.h
View File

@ -326,28 +326,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.
*
@ -474,54 +448,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.
*
@ -584,50 +510,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

2
src/lib/elementary/elm_priv.h
View File

@ -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 */