summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-15 18:37:25 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 13:34:50 +0900
commit4c634ed78e0b298f916e4c79a7e222100d0085d2 (patch)
tree9fa8b385d3d8c2445ea94c839fdc38a30eb36f7d /src/lib/elementary/efl_ui_win.c
parent8fb194d969ccb9227e56ea60f538d977393408d7 (diff)
efl: Use Eina.Size2D for Efl.Gfx.size
Big patch as a lot of things call or reimplement size_set. Hopefully I got it right... fingers crossed.
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_ui_win.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index bddf5bf45e..275d33fbbb 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2983,9 +2983,9 @@ super_skip:
2983} 2983}
2984 2984
2985EOLIAN static void 2985EOLIAN static void
2986_efl_ui_win_efl_gfx_size_set(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord w, Evas_Coord h) 2986_efl_ui_win_efl_gfx_size_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Size2D sz)
2987{ 2987{
2988 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, w, h)) 2988 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
2989 return; 2989 return;
2990 2990
2991 if (sd->img_obj) 2991 if (sd->img_obj)
@@ -2995,25 +2995,25 @@ _efl_ui_win_efl_gfx_size_set(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord w, Evas_Co
2995 int sw, sh; 2995 int sw, sh;
2996 2996
2997 ecore_evas_screen_geometry_get(sd->ee, NULL, NULL, &sw, &sh); 2997 ecore_evas_screen_geometry_get(sd->ee, NULL, NULL, &sw, &sh);
2998 w = MIN(w, sw); 2998 sz.w = MIN(sz.w, sw);
2999 h = MIN(h, sh); 2999 sz.h = MIN(sz.h, sh);
3000 } 3000 }
3001 if (w < 1) w = 1; 3001 if (sz.w < 1) sz.w = 1;
3002 if (h < 1) h = 1; 3002 if (sz.h < 1) sz.h = 1;
3003 3003
3004 evas_object_image_size_set(sd->img_obj, w, h); 3004 evas_object_image_size_set(sd->img_obj, sz.w, sz.h);
3005 } 3005 }
3006 3006
3007 _elm_win_frame_geometry_adjust(sd); 3007 _elm_win_frame_geometry_adjust(sd);
3008 if (!sd->response) 3008 if (!sd->response)
3009 { 3009 {
3010 sd->req_wh = EINA_TRUE; 3010 sd->req_wh = EINA_TRUE;
3011 sd->req_w = w; 3011 sd->req_w = sz.w;
3012 sd->req_h = h; 3012 sd->req_h = sz.h;
3013 TRAP(sd, resize, w, h); 3013 TRAP(sd, resize, sz.w, sz.h);
3014 } 3014 }
3015 3015
3016 efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h); 3016 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
3017} 3017}
3018 3018
3019static void 3019static void