enlightenment/python-efl
enlightenment
/
python-efl
7
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Partial revert of ecd93319ee 

This API was never meant to be exposed.
This commit is contained in:
Kai Huuhko 2016-08-12 05:51:25 +03:00
parent 55039295f2
commit 30c2ce90c3
3 changed files with 0 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
efl/elementary/image.pxi
View File

@ -375,24 +375,6 @@ cdef class Image(Object):
PyBuffer_Release(&view)
return bool(ret)
property scale:
"""Control the scale of the object's image.
:type: float
.. versionadded:: 1.18
"""
def __set__(self, scale):
elm_image_scale_set(self.obj, scale)
def __get__(self):
return elm_image_scale_get(self.obj)
def scale_set(self, scale):
elm_image_scale_set(self.obj, scale)
def scale_get(self):
return elm_image_scale_get(self.obj)
property fill_outside:
"""Whether the image fills the entire object area, when keeping the
aspect ratio.
@ -488,56 +470,6 @@ cdef class Image(Object):
elm_image_object_size_get(self.obj, &width, &height)
return (width, height)
# TODO: API break, these were renamed to scale_up/down in 1.18 development
# but compatibility funcs were forgotten.
# Add them in once this gets fixed. See phab T4342
#
#property resize_down:
# """Control whether the object's image can be resized to a size smaller
# than the original one.
# :type: bool
# .. versionadded:: 1.18
# """
# def __set__(self, bint resize_down):
# elm_image_resize_down_set(self.obj, resize_down)
# def __get__(self):
# return bool(elm_image_resize_down_get(self.obj))
#def resize_down_set(self, bint resize_down):
# elm_image_resize_down_set(self.obj, resize_down)
#def resize_down_get(self):
# return bool(elm_image_resize_down_get(self.obj))
#property resize_up:
# """Control whether the object's image can be resized to a size larger
# than the original one.
# :type: bool
# .. versionadded:: 1.18
# """
# def __set__(self, bint resize_up):
# elm_image_resize_up_set(self.obj, resize_up)
# def __get__(self):
# return bool(elm_image_resize_up_get(self.obj))
#def resize_up_set(self, bint resize_up):
# elm_image_resize_up_set(self.obj, resize_up)
#def resize_up_get(self):
# return bool(elm_image_resize_up_get(self.obj))
def sizing_evas(self):
"""Re-evaluate the object's final geometry.
.. versionadded:: 1.18
"""
elm_image_sizing_eval(self.obj)
property resizable:
"""Whether the object is (up/down) resizable.
@ -585,36 +517,6 @@ cdef class Image(Object):
def no_scale_get(self):
return bool(elm_image_no_scale_get(self.obj))
property fill_inside:
"""Whether the whole image is inside entire object area, when keeping the
aspect ratio.
If the image should keep its aspect ratio when the object 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 *True*) or let the extra width or height go
outside of the object, and the image will fill the entire object
(*fill_outside* is *False*).
.. note:: This option will have no effect if :py:attr:`aspect_fixed`
is set to *False*.
:type: bool
.. versionadded:: 1.18
"""
def __get__(self):
return bool(elm_image_fill_inside_get(self.obj))
def __set__(self, fill_inside):
elm_image_fill_inside_set(self.obj, fill_inside)
def fill_inside_set(self, fill_inside):
elm_image_fill_inside_set(self.obj, fill_inside)
def fill_inside_get(self):
return bool(elm_image_fill_inside_get(self.obj))
property aspect_fixed:
"""Whether the original aspect ratio of the image should be kept on
resize.

9
efl/elementary/image_cdef.pxi
View File

@ -38,8 +38,6 @@ cdef extern from "Elementary.h":
void elm_image_editable_set(Evas_Object *obj, Eina_Bool editable)
Eina_Bool elm_image_editable_get(const Evas_Object *obj)
Eina_Bool elm_image_memfile_set(Evas_Object *obj, const void *img, size_t size, const char *format, const char *key)
void elm_image_scale_set(Evas_Object *obj, double scale)
double elm_image_scale_get(const Evas_Object *obj)
void elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside)
Eina_Bool elm_image_fill_outside_get(const Evas_Object *obj)
void elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled)
@ -47,16 +45,9 @@ cdef extern from "Elementary.h":
Elm_Image_Orient elm_image_orient_get(const Evas_Object *obj)
Evas_Object *elm_image_object_get(const Evas_Object *obj)
void elm_image_object_size_get(const Evas_Object *obj, int *w, int *h)
#void elm_image_resize_down_set(Evas_Object *obj, Eina_Bool resize_down)
#Eina_Bool elm_image_resize_down_get(const Evas_Object *obj)
#void elm_image_resize_up_set(Evas_Object *obj, Eina_Bool resize_up)
#Eina_Bool elm_image_resize_up_get(const Evas_Object *obj)
void elm_image_sizing_eval(Evas_Object *obj)
void elm_image_resizable_set(Evas_Object *obj, Eina_Bool scale_up,Eina_Bool scale_down)
void elm_image_resizable_get(const Evas_Object *obj, Eina_Bool *scale_up,Eina_Bool *scale_down)
void elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale)
Eina_Bool elm_image_no_scale_get(const Evas_Object *obj)
void elm_image_fill_inside_set(Evas_Object *obj, Eina_Bool fill_inside)
Eina_Bool elm_image_fill_inside_get(const Evas_Object *obj)
void elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed)
Eina_Bool elm_image_aspect_fixed_get(const Evas_Object *obj)

12
tests/elementary/test_02_image_icon.py
View File

@ -72,18 +72,6 @@ class TestElmImage(unittest.TestCase):
self.o.smooth = False
self.assertFalse(self.o.smooth)
# self.assertTrue(self.o.resize_up)
# self.o.resize_up = False
# self.assertFalse(self.o.resize_up)
# self.assertTrue(self.o.resize_down)
# self.o.resize_down = False
# self.assertFalse(self.o.resize_down)
self.assertFalse(self.o.fill_inside)
self.o.fill_inside = True
self.assertTrue(self.o.fill_inside)
class TestElmIcon(unittest.TestCase):