summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-08-12 08:50:48 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-08-12 08:51:11 +0900
commitf906009c8354572a857a75ad431e7caea265f2e1 (patch)
tree6a627c9764ea5c3aded67a243f60daaf134e13f2
parent170ca4d710a77e5d3d4caf74d4ae44d6c23ffe9b (diff)
downloadefl-f906009c8354572a857a75ad431e7caea265f2e1.tar.gz
elm_image: Remove EAPI sizing_eval
This is an internal API, should not be exposed as EAPI. Doing this before the 1.18.x announcement. @fix
-rw-r--r--src/lib/elementary/efl_ui_image.c12
-rw-r--r--src/lib/elementary/elm_icon.c2
-rw-r--r--src/lib/elementary/elm_image_legacy.h8
-rw-r--r--src/lib/elementary/elm_priv.h1
4 files changed, 4 insertions, 19 deletions
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 6410d54dbb..9ca46329e5 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -38,7 +38,6 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
static Eina_Bool _efl_ui_image_smart_internal_file_set(Eo *obj, Efl_Ui_Image_Data *sd, const char *file, const Eina_File *f, const char *key);
-static void _efl_ui_image_sizing_eval(Eo *obj);
static const Elm_Action key_actions[] = {
{"activate", _key_action_activate},
@@ -777,8 +776,8 @@ _efl_ui_image_internal_scale_set(Evas_Object *obj, Efl_Ui_Image_Data *sd, double
_efl_ui_image_internal_sizing_eval(obj, sd);
}
-static void
-_efl_ui_image_sizing_eval(Eo *obj)
+void
+_efl_ui_image_sizing_eval(Evas_Object *obj)
{
Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
int w = 0, h = 0;
@@ -1968,13 +1967,6 @@ elm_image_scale_up_get(const Evas_Object *obj)
}
EAPI void
-elm_image_sizing_eval(Evas_Object *obj)
-{
- EFL_UI_IMAGE_CHECK(obj);
- _efl_ui_image_sizing_eval(obj);
-}
-
-EAPI void
elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale)
{
EFL_UI_IMAGE_CHECK(obj);
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index a776980363..0d2f274129 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);
+ _elm_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 2cb4b71272..2cd9b99c71 100644
--- a/src/lib/elementary/elm_image_legacy.h
+++ b/src/lib/elementary/elm_image_legacy.h
@@ -522,14 +522,6 @@ EAPI void elm_image_resize_up_set(Evas_Object *obj, Eina_Bool resize_up);
*/
EAPI Eina_Bool elm_image_resize_up_get(const Evas_Object *obj);
-/** Re-evaluate the object's final geometry.
- *
- * @since 1.7
- *
- * @ingroup Elm_Image
- */
-EAPI void elm_image_sizing_eval(Evas_Object *obj);
-
/**
* @brief Control if the object is (up/down) resizable.
*
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index dcdecee995..8f17ac65c3 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -544,6 +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);
/* end of DEPRECATED */