diff --git a/src/lib/efl/interfaces/efl_gfx_entity.eo b/src/lib/efl/interfaces/efl_gfx_entity.eo index 2a3c86814e..5133c80c9d 100644 --- a/src/lib/efl/interfaces/efl_gfx_entity.eo +++ b/src/lib/efl/interfaces/efl_gfx_entity.eo @@ -32,7 +32,7 @@ interface Efl.Gfx.Entity { Note that setting the actual size of an object might be the job of its container, so this function might have no effect. - Look at @Efl.Gfx.Size.Hint instead, when manipulating + Look at @Efl.Gfx.Size_Hint instead, when manipulating widgets. ]] } diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_size_hint.eo index f358b2b4ef..e7e659432b 100644 --- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo +++ b/src/lib/efl/interfaces/efl_gfx_size_hint.eo @@ -1,12 +1,12 @@ import eina_types; import efl_gfx_types; -const Efl.Gfx.Size.Hint.Expand: double = 1.0; - [[Use with @Efl.Gfx.Size.Hint.hint_weight.]] -const Efl.Gfx.Size.Hint.Fill: double = -1.0; - [[Special value for @Efl.Gfx.Size.Hint.hint_align.]] +const Efl.Gfx.Size_Hint_Expand: double = 1.0; + [[Use with @Efl.Gfx.Size_Hint.hint_weight.]] +const Efl.Gfx.Size_Hint_Fill: double = -1.0; + [[Special value for @Efl.Gfx.Size_Hint.hint_align.]] -interface Efl.Gfx.Size.Hint +interface Efl.Gfx.Size_Hint { [[Efl graphics size hint interface]] event_prefix: efl_gfx_entity; @@ -59,7 +59,7 @@ interface Efl.Gfx.Size.Hint @image html aspect-control-horizontal.png */ values { - mode: Efl.Gfx.Size.Hint.Aspect; [[Mode of interpretation.]] + mode: Efl.Gfx.Size_Hint_Aspect; [[Mode of interpretation.]] sz: Eina.Size2D; [[Base size to use for aspecting.]] /* FIXME: do we want min/max like Edje instead?? @@ -178,7 +178,7 @@ interface Efl.Gfx.Size.Hint This is a hint on how a container object should resize a given child within its area. Containers may adhere to the simpler logic of just expanding the child object's dimensions to fit - its own (see the @Efl.Gfx.Size.Hint.Expand helper weight macro) or + its own (see the @Efl.Gfx.Size_Hint_Expand helper weight macro) or the complete one of taking each child's weight hint as real weights to how much of its size to allocate for them in each axis. A container is supposed to, after normalizing the @@ -203,7 +203,7 @@ interface Efl.Gfx.Size.Hint These are hints on how to align an object inside the boundaries of a container/manager. Accepted values are in - the 0.0 to 1.0 range, with the special value @Efl.Gfx.Size.Hint.Fill + the 0.0 to 1.0 range, with the special value @Efl.Gfx.Size_Hint_Fill used to specify "justify" or "fill" by some users. In this case, maximum size hints should be enforced with higher priority, if they are set. Also, any padding hint set on @@ -228,9 +228,9 @@ interface Efl.Gfx.Size.Hint */ values { x: double; [[Double, ranging from 0.0 to 1.0 or with the special value - @Efl.Gfx.Size.Hint.Fill, to use as horizontal alignment hint.]] + @Efl.Gfx.Size_Hint_Fill, to use as horizontal alignment hint.]] y: double; [[Double, ranging from 0.0 to 1.0 or with the special value - @Efl.Gfx.Size.Hint.Fill, to use as vertical alignment hint.]] + @Efl.Gfx.Size_Hint_Fill, to use as vertical alignment hint.]] } } } diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot index 9ec0e7fc93..efadc8ff61 100644 --- a/src/lib/efl/interfaces/efl_gfx_types.eot +++ b/src/lib/efl/interfaces/efl_gfx_types.eot @@ -169,11 +169,11 @@ struct Efl.Gfx.Event.Render_Post updated in the canvas.]] } -enum Efl.Gfx.Size.Hint.Aspect +enum Efl.Gfx.Size_Hint_Aspect { [[Aspect types/policies for scaling size hints. - See also @Efl.Gfx.Size.Hint.hint_aspect. + See also @Efl.Gfx.Size_Hint.hint_aspect. ]] none = 0, [[No preference on either direction of the container diff --git a/src/lib/elementary/efl_ui_panes_part.eo b/src/lib/elementary/efl_ui_panes_part.eo index f025e1d9f7..ec3a3ba408 100644 --- a/src/lib/elementary/efl_ui_panes_part.eo +++ b/src/lib/elementary/efl_ui_panes_part.eo @@ -6,7 +6,7 @@ class Efl.Ui.Panes.Part (Efl.Ui.Layout.Part_Content) @property hint_min_allow { [[Allows the user to set size hints to be respected and ignored combined with a minimum size. If this flag is set, the minimum size set by - @Efl.Gfx.Size.Hint.hint_min.set is respected forcefully. + @Efl.Gfx.Size_Hint.hint_min.set is respected forcefully. ]] values { allow: bool; [[If $true minimum size is forced]] @@ -15,7 +15,7 @@ class Efl.Ui.Panes.Part (Efl.Ui.Layout.Part_Content) @property split_ratio_min { [[Controls the relative minimum size of panes widget's part. - If @Efl.Gfx.Size.Hint.hint_min.set is also used along with + If @Efl.Gfx.Size_Hint.hint_min.set is also used along with @.split_ratio_min.set, maximum value is set as minimum size to part. ]] values { diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 4447df716d..ebab4daca8 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -157,7 +157,7 @@ enum Efl.Ui.Win.Move_Resize_Mode class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Access.Window, Efl.Access.Component, Efl.Access.Widget.Action, Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen, - Efl.Gfx.Size.Hint, Efl.Text, Efl.Config_Global, Efl.Part, + Efl.Gfx.Size_Hint, Efl.Text, Efl.Config_Global, Efl.Part, Efl.Ui.Focus.Manager, Efl.Ui.Focus.Manager.Window_Root) { [[Efl UI window class]] @@ -797,11 +797,11 @@ class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Acces Efl.Screen.screen_dpi { get; } Efl.Screen.screen_rotation { get; } Efl.Screen.screen_size { get; } - Efl.Gfx.Size.Hint.hint_base { get; set; } - Efl.Gfx.Size.Hint.hint_step { get; set; } - Efl.Gfx.Size.Hint.hint_aspect { set; } - Efl.Gfx.Size.Hint.hint_weight { set; } - Efl.Gfx.Size.Hint.hint_max { set; } + Efl.Gfx.Size_Hint.hint_base { get; set; } + Efl.Gfx.Size_Hint.hint_step { get; set; } + Efl.Gfx.Size_Hint.hint_aspect { set; } + Efl.Gfx.Size_Hint.hint_weight { set; } + Efl.Gfx.Size_Hint.hint_max { set; } Efl.Text.text { get; set; } Efl.Canvas.Scene.pointer_position { get; } Efl.Canvas.Pointer.pointer_inside { get; } diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index c2524e0cb9..46644ff49b 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -2,7 +2,7 @@ import efl_text_types; import efl_canvas_animation_types; abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator, - Efl.Input.Interface, Efl.Gfx.Size.Hint, + Efl.Input.Interface, Efl.Gfx.Size_Hint, Efl.Gfx.Map, Efl.Loop.Consumer, Efl.Ui.Base, Efl.Canvas.Pointer) { [[Efl canvas object abstract class]] @@ -609,14 +609,14 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.S Efl.Gfx.Stack.stack_above; Efl.Gfx.Stack.raise; Efl.Gfx.Stack.lower; - Efl.Gfx.Size.Hint.hint_aspect { get; set; } - Efl.Gfx.Size.Hint.hint_align { get; set; } - Efl.Gfx.Size.Hint.hint_combined_min { get; } - Efl.Gfx.Size.Hint.hint_restricted_min { get; set; } - Efl.Gfx.Size.Hint.hint_min { get; set; } - Efl.Gfx.Size.Hint.hint_max { get; set; } - Efl.Gfx.Size.Hint.hint_margin { get; set; } - Efl.Gfx.Size.Hint.hint_weight { get; set; } + Efl.Gfx.Size_Hint.hint_aspect { get; set; } + Efl.Gfx.Size_Hint.hint_align { get; set; } + Efl.Gfx.Size_Hint.hint_combined_min { get; } + Efl.Gfx.Size_Hint.hint_restricted_min { get; set; } + Efl.Gfx.Size_Hint.hint_min { get; set; } + Efl.Gfx.Size_Hint.hint_max { get; set; } + Efl.Gfx.Size_Hint.hint_margin { get; set; } + Efl.Gfx.Size_Hint.hint_weight { get; set; } Efl.Gfx.Entity.scale { set; get; } Efl.Input.Interface.seat_event_filter { get; set; } Efl.Loop.Consumer.loop { get; }