summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-08-25 11:19:28 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-08-25 13:21:25 +0100
commit1c90fd41bc1a202b474112a7b2b154040baa1bd9 (patch)
tree3e18bbf5b4d497ff4a60fd43484270f846d4f6c1 /src/lib/evas
parentad6573bbfe6850dc2bda762b1006f3d4e5812389 (diff)
evas - obj main - fix enum warnings with valid casts
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/canvas/evas_object_main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 0992a39424..0b813e5968 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1623,11 +1623,11 @@ _efl_canvas_object_efl_gfx_hint_hint_aspect_get(const Eo *eo_obj EINA_UNUSED, Ev
1623{ 1623{
1624 if ((!obj->size_hints) || obj->delete_me) 1624 if ((!obj->size_hints) || obj->delete_me)
1625 { 1625 {
1626 if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE; 1626 if (aspect) *aspect = EFL_GFX_HINT_ASPECT_NONE;
1627 if (sz) *sz = EINA_SIZE2D(0, 0); 1627 if (sz) *sz = EINA_SIZE2D(0, 0);
1628 return; 1628 return;
1629 } 1629 }
1630 if (aspect) *aspect = obj->size_hints->aspect.mode; 1630 if (aspect) *aspect = (Efl_Gfx_Hint_Aspect)obj->size_hints->aspect.mode;
1631 if (sz) 1631 if (sz)
1632 { 1632 {
1633 sz->w = obj->size_hints->aspect.size.w; 1633 sz->w = obj->size_hints->aspect.size.w;
@@ -1651,7 +1651,7 @@ _efl_canvas_object_efl_gfx_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Protecte
1651 if ((obj->size_hints->aspect.mode == (Evas_Aspect_Control)aspect) && 1651 if ((obj->size_hints->aspect.mode == (Evas_Aspect_Control)aspect) &&
1652 (obj->size_hints->aspect.size.w == sz.w) && 1652 (obj->size_hints->aspect.size.w == sz.w) &&
1653 (obj->size_hints->aspect.size.h == sz.h)) return; 1653 (obj->size_hints->aspect.size.h == sz.h)) return;
1654 obj->size_hints->aspect.mode = aspect; 1654 obj->size_hints->aspect.mode = (Evas_Aspect_Control)aspect;
1655 obj->size_hints->aspect.size = sz; 1655 obj->size_hints->aspect.size = sz;
1656 1656
1657 evas_object_inform_call_changed_size_hints(eo_obj, obj); 1657 evas_object_inform_call_changed_size_hints(eo_obj, obj);
@@ -2580,14 +2580,14 @@ evas_object_static_clip_get(const Evas_Object *eo_obj)
2580EAPI void 2580EAPI void
2581evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h) 2581evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h)
2582{ 2582{
2583 efl_gfx_hint_aspect_set(obj, aspect, EINA_SIZE2D(w, h)); 2583 efl_gfx_hint_aspect_set(obj, (Efl_Gfx_Hint_Aspect)aspect, EINA_SIZE2D(w, h));
2584} 2584}
2585 2585
2586EAPI void 2586EAPI void
2587evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h) 2587evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h)
2588{ 2588{
2589 Eina_Size2D sz = { 0, 0 }; 2589 Eina_Size2D sz = { 0, 0 };
2590 efl_gfx_hint_aspect_get(obj, (Efl_Gfx_Hint_Aspect*)aspect, &sz); 2590 efl_gfx_hint_aspect_get(obj, (Efl_Gfx_Hint_Aspect *)aspect, &sz);
2591 if (w) *w = sz.w; 2591 if (w) *w = sz.w;
2592 if (h) *h = sz.h; 2592 if (h) *h = sz.h;
2593} 2593}