From 5542d6dc480744e9d4103264442573183e9f9266 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 8 Jun 2016 17:19:17 +0900 Subject: [PATCH] Efl: Add hint_ prefix to all size hints This covers: - base - step - aspect The prefix hint_ is useful for bindings, and does not change the generated C API. --- src/lib/efl/interfaces/efl_gfx_size_hint.eo | 58 +++++++++-------------------- src/lib/elementary/efl_ui_win.c | 16 ++++---- src/lib/elementary/efl_ui_win.eo | 12 +++--- src/lib/evas/canvas/evas_object.eo | 4 +- src/lib/evas/canvas/evas_object_main.c | 4 +- 5 files changed, 35 insertions(+), 59 deletions(-) diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_size_hint.eo index 78babdc..3438abe 100644 --- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo +++ b/src/lib/efl/interfaces/efl_gfx_size_hint.eo @@ -3,48 +3,39 @@ import efl_gfx_types; interface Efl.Gfx.Size.Hint { methods { - /* FIXME prefix hint_ */ - @property base { - set { - [[Set the hint for an object's base size used with stepping calculation + @property hint_base { + [[Base size for objects with sizing restrictions. - Base size + stepping is what is calculated for object sizing - restrictions. + This is not a size enforcement in any way, it's just a hint + that should be used whenever appropriate. - ]] - } - get { - [[Get the base size of an object. + @.hint_base + N x @.hint_step is what is calculated for object + sizing restrictions. - ]] - } + See also @.hint_step. + ]] values { w: int; [[The base width.]] h: int; [[The base height.]] } } - /* FIXME prefix hint_ */ - @property step { - set { - [[Set the hint for an object stepping used with sizing calculation. + @property hint_step { + [[Step size for objects with sizing restrictions. - Base size + stepping is what is calculated for object sizing - restrictions. + This is not a size enforcement in any way, it's just a hint + that should be used whenever appropriate. - ]] - } - get { - [[Get the stepping of an object. + Set this to for an object to scale up by steps and not continuously. - ]] - } + @.hint_base + N x @.hint_step is what is calculated for object + sizing restrictions. + ]] values { w: int; [[The stepping width (0 disables).]] h: int; [[The stepping height (0 disables).]] } } - /* FIXME prefix hint_ */ - @property aspect { + @property hint_aspect { [[Defines the aspect ratio to respect when scaling this object. The aspect ratio is defined as the width / height ratio of the @@ -57,20 +48,9 @@ interface Efl.Gfx.Size.Hint ]] /* @image html any-policy.png - @image rtf any-policy.png - @image latex any-policy.eps - @image html aspect-control-none-neither.png - @image rtf aspect-control-none-neither.png - @image latex aspect-control-none-neither.eps - @image html aspect-control-both.png - @image rtf aspect-control-both.png - @image latex aspect-control-both.eps - @image html aspect-control-horizontal.png - @image rtf aspect-control-horizontal.png - @image latex aspect-control-horizontal.eps */ values { mode: Efl.Gfx.Size.Hint.Aspect; [[Mode of interpretation.]] @@ -156,8 +136,6 @@ interface Efl.Gfx.Size.Hint ]] /* @image html padding-hints.png - @image rtf padding-hints.png - @image latex padding-hints.eps */ values { l: int; [[Integer to specify left padding.]] @@ -219,8 +197,6 @@ interface Efl.Gfx.Size.Hint ]] /* @image html alignment-hints.png - @image rtf alignment-hints.png - @image latex alignment-hints.eps */ values { x: double; [[Double, ranging from 0.0 to 1.0 or with the special value diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index e58a14d..afe438c 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4784,8 +4784,8 @@ _win_aspect_get(Efl_Ui_Win_Data *sd) } EOLIAN static void -_efl_ui_win_efl_gfx_size_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, - Efl_Gfx_Size_Hint_Aspect mode EINA_UNUSED, int w, int h) +_efl_ui_win_efl_gfx_size_hint_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, + Efl_Gfx_Size_Hint_Aspect mode EINA_UNUSED, int w, int h) { pd->aspect_w = w; pd->aspect_h = h; @@ -4794,8 +4794,8 @@ _efl_ui_win_efl_gfx_size_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *p } EOLIAN static void -_efl_ui_win_efl_gfx_size_hint_aspect_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, - Efl_Gfx_Size_Hint_Aspect *mode, int *w, int *h) +_efl_ui_win_efl_gfx_size_hint_hint_aspect_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, + Efl_Gfx_Size_Hint_Aspect *mode, int *w, int *h) { if (mode) *mode = EFL_GFX_SIZE_HINT_ASPECT_NONE; if (w) *w = pd->aspect_w; @@ -4803,7 +4803,7 @@ _efl_ui_win_efl_gfx_size_hint_aspect_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *p } EOLIAN static void -_efl_ui_win_efl_gfx_size_hint_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int w, int h) +_efl_ui_win_efl_gfx_size_hint_hint_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int w, int h) { sd->size_base_w = w; sd->size_base_h = h; @@ -4814,14 +4814,14 @@ _efl_ui_win_efl_gfx_size_hint_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, } EOLIAN static void -_efl_ui_win_efl_gfx_size_hint_base_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h) +_efl_ui_win_efl_gfx_size_hint_hint_base_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h) { if (w) *w = sd->size_base_w; if (h) *h = sd->size_base_h; } EOLIAN static void -_efl_ui_win_efl_gfx_size_hint_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int w, int h) +_efl_ui_win_efl_gfx_size_hint_hint_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int w, int h) { sd->size_step_w = w; sd->size_step_h = h; @@ -4832,7 +4832,7 @@ _efl_ui_win_efl_gfx_size_hint_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, } EOLIAN static void -_efl_ui_win_efl_gfx_size_hint_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h) +_efl_ui_win_efl_gfx_size_hint_hint_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h) { if (w) *w = sd->size_step_w; if (h) *h = sd->size_step_h; diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 6b864ee..d0f4ef1 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -790,12 +790,12 @@ class Efl.Ui.Win (Elm.Widget, Elm.Interface.Atspi.Window, Efl.Screen.dpi.get; Efl.Screen.rotation.get; Efl.Screen.size.get; - Efl.Gfx.Size.Hint.base.set; - Efl.Gfx.Size.Hint.base.get; - Efl.Gfx.Size.Hint.step.set; - Efl.Gfx.Size.Hint.step.get; - Efl.Gfx.Size.Hint.aspect.set; - Efl.Gfx.Size.Hint.aspect.get; + Efl.Gfx.Size.Hint.hint_base.set; + Efl.Gfx.Size.Hint.hint_base.get; + Efl.Gfx.Size.Hint.hint_step.set; + Efl.Gfx.Size.Hint.hint_step.get; + Efl.Gfx.Size.Hint.hint_aspect.set; + Efl.Gfx.Size.Hint.hint_aspect.get; Efl.Text.text.set; Efl.Text.text.get; } diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo index f864260..02aadc5 100644 --- a/src/lib/evas/canvas/evas_object.eo +++ b/src/lib/evas/canvas/evas_object.eo @@ -898,8 +898,8 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack, Efl.Gfx.Stack.stack_above; Efl.Gfx.Stack.raise; Efl.Gfx.Stack.lower; - Efl.Gfx.Size.Hint.aspect.set; - Efl.Gfx.Size.Hint.aspect.get; + Efl.Gfx.Size.Hint.hint_aspect.set; + Efl.Gfx.Size.Hint.hint_aspect.get; Efl.Gfx.Size.Hint.hint_align.set; Efl.Gfx.Size.Hint.hint_align.get; Efl.Gfx.Size.Hint.hint_content_min.set; diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index a095089..fbb0f81 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -1186,7 +1186,7 @@ _evas_object_efl_gfx_size_hint_hint_request_set(Eo *eo_obj, Evas_Object_Protecte } EOLIAN static void -_evas_object_efl_gfx_size_hint_aspect_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect *aspect, Evas_Coord *w, Evas_Coord *h) +_evas_object_efl_gfx_size_hint_hint_aspect_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect *aspect, Evas_Coord *w, Evas_Coord *h) { if ((!obj->size_hints) || obj->delete_me) { @@ -1201,7 +1201,7 @@ _evas_object_efl_gfx_size_hint_aspect_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Pr } EOLIAN static void -_evas_object_efl_gfx_size_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect aspect, Evas_Coord w, Evas_Coord h) +_evas_object_efl_gfx_size_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect aspect, Evas_Coord w, Evas_Coord h) { if (obj->delete_me) return; -- 2.7.4