summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 16:38:47 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 16:38:47 +0900
commit6b5d155918452df206a9b8142842cbc6af94ae1a (patch)
treef705d1466c74171b736f90efa7c97f1a89b0ea22 /src/lib/elementary/efl_ui_win.c
parenta72f3ec64ec8dfc20c68e1b471a6374a04058f8b (diff)
efl: Use Eina.Size2D for size hints base & step
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_ui_win.c44
1 files changed, 24 insertions, 20 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 95fa4303c5..258755fb74 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -5963,29 +5963,28 @@ _efl_ui_win_efl_gfx_size_hint_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Da
5963} 5963}
5964 5964
5965EOLIAN static void 5965EOLIAN static void
5966_efl_ui_win_efl_gfx_size_hint_hint_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int w, int h) 5966_efl_ui_win_efl_gfx_size_hint_hint_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Size2D sz)
5967{ 5967{
5968 sd->size_base_w = w; 5968 sd->size_base_w = sz.w;
5969 sd->size_base_h = h; 5969 sd->size_base_h = sz.h;
5970 TRAP(sd, size_base_set, w, h); 5970 TRAP(sd, size_base_set, sz.w, sz.h);
5971#ifdef HAVE_ELEMENTARY_X 5971#ifdef HAVE_ELEMENTARY_X
5972 _elm_win_xwin_update(sd); 5972 _elm_win_xwin_update(sd);
5973#endif 5973#endif
5974} 5974}
5975 5975
5976EOLIAN static void 5976EOLIAN static Eina_Size2D
5977_efl_ui_win_efl_gfx_size_hint_hint_base_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h) 5977_efl_ui_win_efl_gfx_size_hint_hint_base_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
5978{ 5978{
5979 if (w) *w = sd->size_base_w; 5979 return EINA_SIZE2D(sd->size_base_w, sd->size_base_h);
5980 if (h) *h = sd->size_base_h;
5981} 5980}
5982 5981
5983EOLIAN static void 5982EOLIAN static void
5984_efl_ui_win_efl_gfx_size_hint_hint_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int w, int h) 5983_efl_ui_win_efl_gfx_size_hint_hint_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Size2D sz)
5985{ 5984{
5986 sd->size_step_w = w; 5985 sd->size_step_w = sz.w;
5987 sd->size_step_h = h; 5986 sd->size_step_h = sz.h;
5988 TRAP(sd, size_step_set, w, h); 5987 TRAP(sd, size_step_set, sz.w, sz.h);
5989#ifdef HAVE_ELEMENTARY_X 5988#ifdef HAVE_ELEMENTARY_X
5990 _elm_win_xwin_update(sd); 5989 _elm_win_xwin_update(sd);
5991#endif 5990#endif
@@ -6008,11 +6007,10 @@ _efl_ui_win_efl_gfx_size_hint_hint_max_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Si
6008 } 6007 }
6009} 6008}
6010 6009
6011EOLIAN static void 6010EOLIAN static Eina_Size2D
6012_efl_ui_win_efl_gfx_size_hint_hint_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h) 6011_efl_ui_win_efl_gfx_size_hint_hint_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6013{ 6012{
6014 if (w) *w = sd->size_step_w; 6013 return EINA_SIZE2D(sd->size_step_w, sd->size_step_h);
6015 if (h) *h = sd->size_step_h;
6016} 6014}
6017 6015
6018EAPI void 6016EAPI void
@@ -7731,25 +7729,31 @@ elm_win_title_get(const Evas_Object *obj)
7731EAPI void 7729EAPI void
7732elm_win_size_base_set(Evas_Object *obj, int w, int h) 7730elm_win_size_base_set(Evas_Object *obj, int w, int h)
7733{ 7731{
7734 efl_gfx_size_hint_base_set(obj, w, h); 7732 efl_gfx_size_hint_base_set(obj, EINA_SIZE2D(w, h));
7735} 7733}
7736 7734
7737EAPI void 7735EAPI void
7738elm_win_size_base_get(const Evas_Object *obj, int *w, int *h) 7736elm_win_size_base_get(const Evas_Object *obj, int *w, int *h)
7739{ 7737{
7740 efl_gfx_size_hint_base_get(obj, w, h); 7738 Eina_Size2D sz;
7739 sz = efl_gfx_size_hint_base_get(obj);
7740 if (w) *w = sz.w;
7741 if (h) *h = sz.h;
7741} 7742}
7742 7743
7743EAPI void 7744EAPI void
7744elm_win_size_step_set(Evas_Object *obj, int w, int h) 7745elm_win_size_step_set(Evas_Object *obj, int w, int h)
7745{ 7746{
7746 efl_gfx_size_hint_step_set(obj, w, h); 7747 efl_gfx_size_hint_step_set(obj, EINA_SIZE2D(w, h));
7747} 7748}
7748 7749
7749EAPI void 7750EAPI void
7750elm_win_size_step_get(const Evas_Object *obj, int *w, int *h) 7751elm_win_size_step_get(const Evas_Object *obj, int *w, int *h)
7751{ 7752{
7752 efl_gfx_size_hint_step_get(obj, w, h); 7753 Eina_Size2D sz;
7754 sz = efl_gfx_size_hint_step_get(obj);
7755 if (w) *w = sz.w;
7756 if (h) *h = sz.h;
7753} 7757}
7754 7758
7755EAPI void 7759EAPI void