summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_object_image.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-03-02 15:07:03 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-03-15 11:11:59 +0900
commite9508ea80e6d333ad89645a1e03c084a7589e1f6 (patch)
tree7b81a013aab1a04e6e38b0ce1d5d7d94c51b4d6b /src/lib/evas/canvas/evas_object_image.c
parentb640cb5ba9af16533a6625140c4e5e8a79ad7f01 (diff)
Efl.Gfx.Fill: Remove fill_spread
It's not actually implemented anywhere. There's a flag that's never read. Proper support would require quite some work. Once we actually implement fill_spread support, we can bring the API back without breaking compatibility.
Diffstat (limited to '')
-rw-r--r--src/lib/evas/canvas/evas_object_image.c39
1 files changed, 9 insertions, 30 deletions
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 8fd8c94c8b..351c481502 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -93,7 +93,6 @@ struct _Evas_Object_Image_State
93 } u; 93 } u;
94 const char *key; 94 const char *key;
95 int frame; 95 int frame;
96 int spread;
97 96
98 Evas_Colorspace cspace; 97 Evas_Colorspace cspace;
99 Evas_Image_Orient orient; 98 Evas_Image_Orient orient;
@@ -244,7 +243,6 @@ static const Evas_Object_Image_State default_state = {
244 { NULL }, //u 243 { NULL }, //u
245 NULL, //key 244 NULL, //key
246 0, //frame 245 0, //frame
247 EVAS_TEXTURE_REPEAT,
248 EVAS_COLORSPACE_ARGB8888, 246 EVAS_COLORSPACE_ARGB8888,
249 EVAS_IMAGE_ORIENT_NONE, 247 EVAS_IMAGE_ORIENT_NONE,
250 248
@@ -1039,39 +1037,17 @@ _evas_image_efl_gfx_fill_fill_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o,
1039} 1037}
1040 1038
1041EAPI void 1039EAPI void
1042evas_object_image_fill_spread_set(Evas_Image *obj, Evas_Fill_Spread spread) 1040evas_object_image_fill_spread_set(Evas_Image *obj EINA_UNUSED, Evas_Fill_Spread spread)
1043{ 1041{
1044 efl_gfx_fill_spread_set((Evas_Image *)obj, spread); 1042 /* not implemented! */
1045} 1043 if (spread != EFL_GFX_FILL_REPEAT)
1046 1044 WRN("Fill spread support is not implemented!");
1047EOLIAN static void
1048_evas_image_efl_gfx_fill_fill_spread_set(Eo *eo_obj, Evas_Image_Data *o,
1049 Efl_Gfx_Fill_Spread spread)
1050{
1051 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1052
1053 if (spread == (Evas_Fill_Spread)o->cur->spread) return;
1054
1055 evas_object_async_block(obj);
1056 EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
1057 state_write->spread = spread;
1058 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
1059
1060 o->changed = EINA_TRUE;
1061 evas_object_change(eo_obj, obj);
1062} 1045}
1063 1046
1064EAPI Evas_Fill_Spread 1047EAPI Evas_Fill_Spread
1065evas_object_image_fill_spread_get(const Evas_Image *obj) 1048evas_object_image_fill_spread_get(const Evas_Image *obj EINA_UNUSED)
1066{
1067 return efl_gfx_fill_spread_get((Evas_Image *)obj);
1068}
1069
1070EOLIAN static Efl_Gfx_Fill_Spread
1071_evas_image_efl_gfx_fill_fill_spread_get(Eo *eo_obj EINA_UNUSED,
1072 Evas_Image_Data *o)
1073{ 1049{
1074 return (Evas_Fill_Spread)o->cur->spread;; 1050 return EFL_GFX_FILL_REPEAT;
1075} 1051}
1076 1052
1077EAPI void 1053EAPI void
@@ -4938,12 +4914,14 @@ evas_object_image_mmap_get(const Evas_Image *obj, const Eina_File **f, const cha
4938EAPI Eina_Bool 4914EAPI Eina_Bool
4939evas_object_image_save(const Eo *obj, const char *file, const char *key, const char *flags) 4915evas_object_image_save(const Eo *obj, const char *file, const char *key, const char *flags)
4940{ 4916{
4917 Eina_Bool ret;
4941 return efl_file_save((Eo *) obj, file, key, flags); 4918 return efl_file_save((Eo *) obj, file, key, flags);
4942} 4919}
4943 4920
4944EAPI Eina_Bool 4921EAPI Eina_Bool
4945evas_object_image_animated_get(const Eo *obj) 4922evas_object_image_animated_get(const Eo *obj)
4946{ 4923{
4924 Eina_Bool ret;
4947 return efl_image_animated_get((Eo *) obj); 4925 return efl_image_animated_get((Eo *) obj);
4948} 4926}
4949 4927
@@ -4968,6 +4946,7 @@ evas_object_image_smooth_scale_set(Eo *obj, Eina_Bool smooth_scale)
4968EAPI Eina_Bool 4946EAPI Eina_Bool
4969evas_object_image_smooth_scale_get(const Eo *obj) 4947evas_object_image_smooth_scale_get(const Eo *obj)
4970{ 4948{
4949 Eina_Bool ret;
4971 return efl_image_smooth_scale_get((Eo *) obj); 4950 return efl_image_smooth_scale_get((Eo *) obj);
4972} 4951}
4973 4952