enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

evas: Remove Evas.Coord from EO 

This may be a bit more controversial...
But Evas_Coord really is just an int and all the internals
of EFL assume that the base coordinate type is a 32-bit int.
So this type is a bit redondant and can't easily be changed
to, say, a float or int64.

Ref T5312
This commit is contained in:
Jean-Philippe Andre 2017-05-15 17:23:11 +09:00
parent a1abc129ec
commit af3cb10185
31 changed files with 226 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/lib/edje/edje_object.eo
View File

@ -234,8 +234,8 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
*/
}
values {
minw: Evas.Coord; [[Pointer to a variable where to store the minimum width]]
minh: Evas.Coord; [[Pointer to a variable where to store the minimum height]]
minw: int; [[Pointer to a variable where to store the minimum width]]
minh: int; [[Pointer to a variable where to store the minimum height]]
}
}
@property size_max {
@ -275,8 +275,8 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
*/
}
values {
maxw: Evas.Coord; [[Pointer to a variable where to store the maximum width]]
maxh: Evas.Coord; [[Pointer to a variable where to store the maximum height]]
maxw: int; [[Pointer to a variable where to store the maximum width]]
maxh: int; [[Pointer to a variable where to store the maximum height]]
}
}
preload {
@ -329,10 +329,10 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
documentation, then.]]
params {
@out minw: Evas.Coord; [[Pointer to a variable where to store the minimum
required width]]
@out minh: Evas.Coord; [[Pointer to a variable where to store the minimum
required height]]
@out minw: int; [[Pointer to a variable where to store the minimum
required width]]
@out minh: int; [[Pointer to a variable where to store the minimum
required height]]
}
}
size_min_restricted_calc {
@ -353,14 +353,14 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
into account in this calculation.]]
params {
@out minw: Evas.Coord; [[Pointer to a variable where to store the minimum
required width]]
@out minh: Evas.Coord; [[Pointer to a variable where to store the minimum
required height]]
@in restrictedw: Evas.Coord; [[Do not allow object's calculated (minimum) width
to be less than this value]]
@in restrictedh: Evas.Coord; [[Do not allow object's calculated (minimum)
height to be less than this value]]
@out minw: int; [[Pointer to a variable where to store the minimum
required width]]
@out minh: int; [[Pointer to a variable where to store the minimum
required height]]
@in restrictedw: int; [[Do not allow object's calculated (minimum) width
to be less than this value]]
@in restrictedh: int; [[Do not allow object's calculated (minimum)
height to be less than this value]]
}
}
parts_extends_calc {
@ -382,14 +382,14 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
return: bool; [[$true on success, $false otherwise]]
params {
@out x: Evas.Coord; [[A pointer to a variable where to store the parts region's
x coordinate]]
@out y: Evas.Coord; [[A pointer to a variable where to store the parts region's
y coordinate]]
@out w: Evas.Coord; [[A pointer to a variable where to store the parts region's
width]]
@out h: Evas.Coord; [[A pointer to a variable where to store the parts region's
height]]
@out x: int; [[A pointer to a variable where to store the parts region's
x coordinate]]
@out y: int; [[A pointer to a variable where to store the parts region's
y coordinate]]
@out w: int; [[A pointer to a variable where to store the parts region's
width]]
@out h: int; [[A pointer to a variable where to store the parts region's
height]]
}
}
calc_force {
@ -910,12 +910,10 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
part: string; [[The Edje part's name]]
}
values {
x: Evas.Coord; [[A pointer to a variable where to store the part's x
coordinate]]
y: Evas.Coord; [[A pointer to a variable where to store the part's y
coordinate]]
w: Evas.Coord; [[A pointer to a variable where to store the part's width]]
h: Evas.Coord; [[A pointer to a variable where to store the part's height]]
x: int; [[A pointer to a variable where to store the part's x coordinate]]
y: int; [[A pointer to a variable where to store the part's y coordinate]]
w: int; [[A pointer to a variable where to store the part's width]]
h: int; [[A pointer to a variable where to store the part's height]]
}
}
@property part_drag_value {
@ -1445,10 +1443,10 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
part: string; [[The part name]]
}
values {
x: Evas.Coord; [[Cursor X position]]
y: Evas.Coord; [[Cursor Y position]]
w: Evas.Coord; [[Cursor width]]
h: Evas.Coord; [[Cursor height]]
x: int; [[Cursor X position]]
y: int; [[Cursor Y position]]
w: int; [[Cursor width]]
h: int; [[Cursor height]]
}
}
@property part_text_cursor_coord {
@ -1462,8 +1460,8 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
values {
part: string; [[The part containing the object.]]
cur: Edje.Cursor; [[The cursor to adjust.]]
x: Evas.Coord; [[X Coordinate.]]
y: Evas.Coord; [[Y Coordinate.]]
x: int; [[X Coordinate.]]
y: int; [[Y Coordinate.]]
}
}
@property part_text_cursor_pos {
@ -2051,10 +2049,10 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
item: string; [[The item name]]
}
values {
cx: Evas.Coord; [[Item x return (relative to entry part)]]
cy: Evas.Coord; [[Item y return (relative to entry part)]]
cw: Evas.Coord; [[Item width return]]
ch: Evas.Coord; [[Item height return]]
cx: int; [[Item x return (relative to entry part)]]
cy: int; [[Item y return (relative to entry part)]]
cw: int; [[Item width return]]
ch: int; [[Item height return]]
}
}
@property part_text_item_list {

16
src/lib/elementary/efl_ui_text.eo
View File

@ -6,19 +6,19 @@ struct Efl.Ui.Text.Anchor_Info
[[EFL UI text anchor information]]
name: string; [[The name of the anchor, as stated in its href.]]
button: int; [[The mouse button used to click on it.]]
x: Evas.Coord; [[Anchor geometry, relative to canvas.]]
y: Evas.Coord; [[Anchor geometry, relative to canvas.]]
w: Evas.Coord; [[Anchor geometry, relative to canvas.]]
h: Evas.Coord; [[Anchor geometry, relative to canvas.]]
x: int; [[Anchor geometry, relative to canvas.]]
y: int; [[Anchor geometry, relative to canvas.]]
w: int; [[Anchor geometry, relative to canvas.]]
h: int; [[Anchor geometry, relative to canvas.]]
}
struct Efl.Ui.Text.Hover_Parent
{
[[EFL text hover parent]]
x: Evas.Coord; [[Hover parent X coordinate]]
y: Evas.Coord; [[Hover parent Y coordinate]]
w: Evas.Coord; [[Hover parent width]]
h: Evas.Coord; [[Hover parent height]]
x: int; [[Hover parent X coordinate]]
y: int; [[Hover parent Y coordinate]]
w: int; [[Hover parent width]]
h: int; [[Hover parent height]]
}
struct Efl.Ui.Text.Anchor_Hover_Info

4
src/lib/elementary/elm_bg.eo
View File

@ -88,8 +88,8 @@ class Elm.Bg (Elm.Layout, Efl.File)
]]
}
values {
w: Evas.Coord; [[The new width of the image pixmap representation.]]
h: Evas.Coord; [[The new height of the image pixmap representation.]]
w: int; [[The new width of the image pixmap representation.]]
h: int; [[The new height of the image pixmap representation.]]
}
}
}

4
src/lib/elementary/elm_box.eo
View File

@ -89,8 +89,8 @@ class Elm.Box (Elm.Widget)
]]
}
values {
horizontal: Evas.Coord; [[The horizontal space between elements]]
vertical: Evas.Coord; [[The vertical space between elements]]
horizontal: int; [[The horizontal space between elements]]
vertical: int; [[The vertical space between elements]]
}
}
@property layout {

12
src/lib/elementary/elm_code_widget.eo
View File

@ -203,8 +203,8 @@ class Elm.Code_Widget (Elm.Layout, Elm.Interface.Atspi.Text)
position_at_coordinates_get {
[[Get the row, col position for a given coordinate on the widget.]]
params {
x: Evas.Coord; [[The x coordinate in the widget]]
y: Evas.Coord; [[The y coordinate in the widget]]
x: int; [[The x coordinate in the widget]]
y: int; [[The y coordinate in the widget]]
row: ptr(uint); [[The row for the coordinates]]
col: ptr(int); [[The column for the coordinates]]
}
@ -215,10 +215,10 @@ class Elm.Code_Widget (Elm.Layout, Elm.Interface.Atspi.Text)
params {
row: uint; [[The row for the requested position]]
col: int; [[The column for the requested position]]
x: ptr(Evas.Coord); [[The x coordinate of the cell at specified position]]
y: ptr(Evas.Coord); [[The y coordinate of the cell at specified position]]
w: ptr(Evas.Coord); [[The width of the cell at specified position]]
h: ptr(Evas.Coord); [[The height of the cell at specified position]]
x: ptr(int); [[The x coordinate of the cell at specified position]]
y: ptr(int); [[The y coordinate of the cell at specified position]]
w: ptr(int); [[The width of the cell at specified position]]
h: ptr(int); [[The height of the cell at specified position]]
}
return: bool; [[$true if a cell exists at the specified position]]
}

8
src/lib/elementary/elm_entry.eo
View File

@ -592,10 +592,10 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
return: bool; [[$true on success, $false otherwise]]
}
values {
x: Evas.Coord; [[X coordinate]]
y: Evas.Coord; [[Y coordinate]]
w: Evas.Coord; [[Width]]
h: Evas.Coord; [[Height]]
x: int; [[X coordinate]]
y: int; [[Y coordinate]]
w: int; [[Width]]
h: int; [[Height]]
}
}
@property imf_context {

16
src/lib/elementary/elm_gengrid.eo
View File

@ -119,8 +119,8 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
]]
}
values {
w: Evas.Coord; [[The group items' width.]]
h: Evas.Coord; [[The group items' height.]]
w: int; [[The group items' width.]]
h: int; [[The group items' height.]]
}
}
@property select_mode {
@ -210,8 +210,8 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
]]
}
values {
w: Evas.Coord; [[The items' width.]]
h: Evas.Coord; [[The items' height.]]
w: int; [[The items' width.]]
h: int; [[The items' height.]]
}
}
@property multi_select_mode {
@ -272,8 +272,8 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
[[Set a given gengrid widget's scrolling page size.]]
}
values {
h_pagesize: Evas.Coord; [[Page size horizontal]]
v_pagesize: Evas.Coord; [[Page size vertical]]
h_pagesize: int; [[Page size horizontal]]
v_pagesize: int; [[Page size vertical]]
}
}
@property selected_item {
@ -436,8 +436,8 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
]]
return: Elm.Widget.Item; [[The item at the coordinates or $null if none.]]
params {
@in x: Evas.Coord; [[The input x coordinate.]]
@in y: Evas.Coord; [[The input y coordinate.]]
@in x: int; [[The input x coordinate.]]
@in y: int; [[The input y coordinate.]]
@out xposret: int; [[The position relative to the item returned here.]]
@out yposret: int; [[The position relative to the item returned here.]]
}

4
src/lib/elementary/elm_gengrid_item.eo
View File

@ -153,8 +153,8 @@ class Elm.Gengrid.Item(Elm.Widget.Item)
@since 1.19]]
}
values {
w : Evas.Coord; [[The item's width.]]
h : Evas.Coord; [[The item's height.]]
w : int; [[The item's width.]]
h : int; [[The item's height.]]
}
}
/* init { FIXME

4
src/lib/elementary/elm_genlist.eo
View File

@ -398,8 +398,8 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
]]
return: Elm.Widget.Item; [[Item at position]]
params {
@in x: Evas.Coord; [[The input x coordinate.]]
@in y: Evas.Coord; [[The input y coordinate.]]
@in x: int; [[The input x coordinate.]]
@in y: int; [[The input y coordinate.]]
@out posret: int; [[The position relative to the item returned here.]]
}
}

2
src/lib/elementary/elm_gesture_layer.eo
View File

@ -68,7 +68,7 @@ class Elm.Gesture_Layer (Elm.Widget)
]]
}
values {
sz: Evas.Coord; [[The finger size.]]
sz: int; [[The finger size.]]
}
}
@property hold_events {

12
src/lib/elementary/elm_grid.eo
View File

@ -13,8 +13,8 @@ class Elm.Grid (Elm.Widget)
[[Get the virtual size of the grid]]
}
values {
w: Evas.Coord; [[The virtual width of the grid]]
h: Evas.Coord; [[The virtual height of the grid]]
w: int; [[The virtual width of the grid]]
h: int; [[The virtual height of the grid]]
}
}
@property children {
@ -45,10 +45,10 @@ class Elm.Grid (Elm.Widget)
[[Pack child at given position and size]]
params {
@in subobj: Efl.Canvas.Object; [[The child to pack.]]
@in x: Evas.Coord; [[The virtual x coord at which to pack it.]]
@in y: Evas.Coord; [[The virtual y coord at which to pack it.]]
@in w: Evas.Coord; [[The virtual width at which to pack it.]]
@in h: Evas.Coord; [[The virtual height at which to pack it.]]
@in x: int; [[The virtual x coord at which to pack it.]]
@in y: int; [[The virtual y coord at which to pack it.]]
@in w: int; [[The virtual width at which to pack it.]]
@in h: int; [[The virtual height at which to pack it.]]
}
}
}

4
src/lib/elementary/elm_interface_fileselector.eo
View File

@ -51,8 +51,8 @@ interface Elm.Interface.Fileselector ()
[[Get the size for the thumbnail of a given file selector widget]]
}
values {
w: Evas.Coord; [[Width]]
h: Evas.Coord; [[Height]]
w: int; [[Width]]
h: int; [[Height]]
}
}
@property hidden_visible {

56
src/lib/elementary/elm_interface_scrollable.eo
View File

@ -165,10 +165,10 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
get {
}
values {
x: Evas.Coord; [[X coordinate of the region]]
y: Evas.Coord; [[Y coordinate of the region]]
w: Evas.Coord; [[Width of the region]]
h: Evas.Coord; [[Height of the region]]
x: int; [[X coordinate of the region]]
y: int; [[Y coordinate of the region]]
w: int; [[Width of the region]]
h: int; [[Height of the region]]
}
}
@property repeat_events {
@ -199,8 +199,8 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
get {
}
values {
x: Evas.Coord; [[The horizontal page relative size]]
y: Evas.Coord; [[The vertical page relative size]]
x: int; [[The horizontal page relative size]]
y: int; [[The vertical page relative size]]
}
}
@property bounce_animator_disabled {
@ -256,8 +256,8 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
values {
pagerel_h: double; [[Page relation horizontal]]
pagerel_v: double; [[Page relation vertical]]
pagesize_h: Evas.Coord; [[Page size horizontal]]
pagesize_v: Evas.Coord; [[Page size vertical]]
pagesize_h: int; [[Page size horizontal]]
pagesize_v: int; [[Page size vertical]]
}
}
@property single_direction {
@ -288,8 +288,8 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
get {
}
values {
x: Evas.Coord; [[X coordinate]]
y: Evas.Coord; [[Y coordinate]]
x: int; [[X coordinate]]
y: int; [[Y coordinate]]
}
}
@property loop {
@ -574,10 +574,10 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
get {
}
values {
x: Evas.Coord; [[X coordinate]]
y: Evas.Coord; [[Y coordinate]]
w: Evas.Coord; [[Width]]
h: Evas.Coord; [[Height]]
x: int; [[X coordinate]]
y: int; [[Y coordinate]]
w: int; [[Width]]
h: int; [[Height]]
}
}
@property content_size {
@ -587,16 +587,16 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
This gets the size of the content object of the scroller.]]
}
values {
w: Evas.Coord; [[Width of the content object.]]
h: Evas.Coord; [[Height of the content object.]]
w: int; [[Width of the content object.]]
h: int; [[Height of the content object.]]
}
}
content_pos_set {
[[Set the content position]]
params {
@in x: Evas.Coord; [[X coordinate]]
@in y: Evas.Coord; [[Y coordinate]]
@in x: int; [[X coordinate]]
@in y: int; [[Y coordinate]]
@in sig: bool; [[Send signals to the theme corresponding to the
scroll direction, or if an edge was reached.]]
}
@ -604,8 +604,8 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
content_pos_get {
[[Get content position]]
params {
@out x: Evas.Coord; [[X coordinate]]
@out y: Evas.Coord; [[Y coordinate]]
@out x: int; [[X coordinate]]
@out y: int; [[Y coordinate]]
}
}
page_show {
@ -633,10 +633,10 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
See @.content_region_show]]
params {
@in x: Evas.Coord; [[X coordinate of the region]]
@in y: Evas.Coord; [[Y coordinate of the region]]
@in w: Evas.Coord; [[Width of the region]]
@in h: Evas.Coord; [[Height of the region]]
@in x: int; [[X coordinate of the region]]
@in y: int; [[Y coordinate of the region]]
@in w: int; [[Width of the region]]
@in h: int; [[Height of the region]]
}
}
page_bring_in {
@ -658,10 +658,10 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
region in the virtual content object (0, 0 starting at the top-left of the
virtual content object) is shown within the scroller.]]
params {
@in x: Evas.Coord; [[X coordinate of the region]]
@in y: Evas.Coord; [[Y coordinate of the region]]
@in w: Evas.Coord; [[Width of the region]]
@in h: Evas.Coord; [[Height of the region]]
@in x: int; [[X coordinate of the region]]
@in y: int; [[Y coordinate of the region]]
@in w: int; [[Width of the region]]
@in h: int; [[Height of the region]]
}
}
content_min_limit {

2
src/lib/elementary/elm_label.eo
View File

@ -26,7 +26,7 @@ class Elm.Label (Elm.Layout)
get {
}
values {
w: Evas.Coord; [[The wrap width in pixels at a minimum where words need to wrap]]
w: int; [[The wrap width in pixels at a minimum where words need to wrap]]
}
}
@property slide_speed {

4
src/lib/elementary/elm_list.eo
View File

@ -297,8 +297,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
return: Elm.Widget.Item; [[The item at the coordinates or NULL if none]]
params {
@in x: Evas.Coord; [[The input x coordinate]]
@in y: Evas.Coord; [[The input y coordinate]]
@in x: int; [[The input x coordinate]]
@in y: int; [[The input y coordinate]]
@out posret: int; [[The position relative to the item returned here]]
}
}

16
src/lib/elementary/elm_map.eo
View File

@ -174,8 +174,8 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
}
values {
degree: double; [[Angle from 0.0 to 360.0 to rotate around Z axis.]]
cx: Evas.Coord; [[Rotation's center horizontal position.]]
cy: Evas.Coord; [[Rotation's center vertical position.]]
cx: int; [[Rotation's center horizontal position.]]
cy: int; [[Rotation's center vertical position.]]
}
}
@property user_agent {
@ -364,8 +364,8 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
params {
@in lon: double; [[The longitude to convert.]]
@in lat: double; [[The latitude to convert.]]
@out x: Evas.Coord; [[A pointer to horizontal coordinate.]]
@out y: Evas.Coord; [[A pointer to vertical coordinate.]]
@out x: int; [[A pointer to horizontal coordinate.]]
@out y: int; [[A pointer to vertical coordinate.]]
}
}
overlay_circle_add {
@ -581,8 +581,8 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
]]
return: ptr(Elm_Map_Overlay); [[The created overlay or $null upon failure.]]
params {
@in x: Evas.Coord; [[horizontal pixel coordinate.]]
@in y: Evas.Coord; [[vertical pixel coordinate.]]
@in x: int; [[horizontal pixel coordinate.]]
@in y: int; [[vertical pixel coordinate.]]
}
}
overlay_add {
@ -617,8 +617,8 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
The canvas coordinates mean x, y coordinate from current viewport.
]]
params {
@in x: Evas.Coord; [[Horizontal coordinate of the point to convert.]]
@in y: Evas.Coord; [[Vertical coordinate of the point to convert.]]
@in x: int; [[Horizontal coordinate of the point to convert.]]
@in y: int; [[Vertical coordinate of the point to convert.]]
@out lon: double; [[A pointer to the longitude.]]
@out lat: double; [[A pointer to the latitude.]]
}

4
src/lib/elementary/elm_menu.eo
View File

@ -14,8 +14,8 @@ class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Menu,
Note: $x and $y coordinates are relative to parent.
]]
params {
@in x: Evas.Coord; [[The new X coordinate]]
@in y: Evas.Coord; [[The new Y coordinate]]
@in x: int; [[The new X coordinate]]
@in y: int; [[The new Y coordinate]]
}
}
item_add {

16
src/lib/elementary/elm_pan.eo
View File

@ -13,8 +13,8 @@ class Elm.Pan (Efl.Canvas.Group.Clipped)
get {
}
values {
x: Evas.Coord; [[X coordinate]]
y: Evas.Coord; [[Y coordinate]]
x: int; [[X coordinate]]
y: int; [[Y coordinate]]
}
}
@property content_size {
@ -22,8 +22,8 @@ class Elm.Pan (Efl.Canvas.Group.Clipped)
get {
}
values {
w: Evas.Coord; [[Width]]
h: Evas.Coord; [[Height]]
w: int; [[Width]]
h: int; [[Height]]
}
}
@property pos_min {
@ -31,8 +31,8 @@ class Elm.Pan (Efl.Canvas.Group.Clipped)
get {
}
values {
x: Evas.Coord; [[X coordinate]]
y: Evas.Coord; [[Y coordinate]]
x: int; [[X coordinate]]
y: int; [[Y coordinate]]
}
}
@property pos_max {
@ -40,8 +40,8 @@ class Elm.Pan (Efl.Canvas.Group.Clipped)
get {
}
values {
x: Evas.Coord; [[X coordinate]]
y: Evas.Coord; [[Y coordinate]]
x: int; [[X coordinate]]
y: int; [[Y coordinate]]
}
}
}

4
src/lib/elementary/elm_panes.eo
View File

@ -99,7 +99,7 @@ class Elm.Panes (Elm.Layout, Efl.Orientation,
get {
}
values {
size: Evas.Coord; [[Value representing minimum size of left side in pixels.]]
size: int; [[Value representing minimum size of left side in pixels.]]
}
}
@property content_right_min_size {
@ -111,7 +111,7 @@ class Elm.Panes (Elm.Layout, Efl.Orientation,
get {
}
values {
size: Evas.Coord; [[Value representing minimum size of right side in pixels.]]
size: int; [[Value representing minimum size of right side in pixels.]]
}
}
}

4
src/lib/elementary/elm_table.eo
View File

@ -22,8 +22,8 @@ class Elm.Table (Elm.Widget)
[[Get padding between cells.]]
}
values {
horizontal: Evas.Coord; [[The horizontal padding.]]
vertical: Evas.Coord; [[The vertical padding.]]
horizontal: int; [[The horizontal padding.]]
vertical: int; [[The vertical padding.]]
}
}
@property align {

40
src/lib/elementary/elm_widget.eo
View File

@ -329,10 +329,10 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
return: bool; [[$true on success, $false otherwise]]
}
values {
x: Evas.Coord; [[X coordinate]]
y: Evas.Coord; [[Y coordinate]]
w: Evas.Coord; [[Width]]
h: Evas.Coord; [[Height]]
x: int; [[X coordinate]]
y: int; [[Y coordinate]]
w: int; [[Width]]
h: int; [[Height]]
}
}
@property top {
@ -487,10 +487,10 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
focus_highlight_geometry_get @const {
[[Get the focus highlight geometry of widget.]]
params {
@out x: Evas.Coord; [[X coordinate]]
@out y: Evas.Coord; [[Y coordinate]]
@out w: Evas.Coord; [[Width]]
@out h: Evas.Coord; [[Height]]
@out x: int; [[X coordinate]]
@out y: int; [[Y coordinate]]
@out w: int; [[Width]]
@out h: int; [[Height]]
}
}
activate {
@ -563,10 +563,10 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
on_focus_region {
[['Virtual' function returning an inner area of a widget that should be brought into the visible area of a broader viewport, may this context arise.]]
params {
@out x: Evas.Coord; [[X coordinate]]
@out y: Evas.Coord; [[Y coordinate]]
@out w: Evas.Coord; [[Width]]
@out h: Evas.Coord; [[Height]]
@out x: int; [[X coordinate]]
@out y: int; [[Y coordinate]]
@out w: int; [[Width]]
@out h: int; [[Height]]
}
return: bool; [[$true on success, $false otherwise]]
}
@ -635,20 +635,20 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
show_region_set {
[[Set show region]]
params {
@in x: Evas.Coord; [[X coordinate]]
@in y: Evas.Coord; [[Y coordinate]]
@in w: Evas.Coord; [[Width]]
@in h: Evas.Coord; [[Height]]
@in x: int; [[X coordinate]]
@in y: int; [[Y coordinate]]
@in w: int; [[Width]]
@in h: int; [[Height]]
@in forceshow: bool; [[$true if show should be forced, $false otherwise]]
}
}
show_region_get @const {
[[Get show region]]
params {
@out x: Evas.Coord @optional; [[X coordinate]]
@out y: Evas.Coord @optional; [[Y coordinate]]
@out w: Evas.Coord @optional; [[Width]]
@out h: Evas.Coord @optional; [[Height]]
@out x: int @optional; [[X coordinate]]
@out y: int @optional; [[Y coordinate]]
@out w: int @optional; [[Width]]
@out h: int @optional; [[Height]]
}
}
scroll_freeze_pop {

1
src/lib/evas/Evas_Common.h
View File

@ -107,6 +107,7 @@ typedef struct _Evas_Coord_Precision_Size Evas_Coord_Precision_Size; /**< Ev
typedef struct _Evas_Position Evas_Position; /**< associates given point in Canvas and Output */
typedef struct _Evas_Precision_Position Evas_Precision_Position; /**< associates given point in Canvas and Output, with sub-pixel precision */
typedef int Evas_Coord; /**< Type used for coordinates (in pixels, int). */
typedef int Evas_Font_Size; /**< Type used for font sizes (int). */
/**

4
src/lib/evas/canvas/efl_canvas_polygon.eo
View File

@ -6,8 +6,8 @@ class Efl.Canvas.Polygon (Efl.Canvas.Object)
point_add {
[[Adds the given point to the given evas polygon object.]]
params {
@in x: Evas.Coord; [[The X coordinate of the given point.]]
@in y: Evas.Coord; [[The Y coordinate of the given point.]]
@in x: int; [[The X coordinate of the given point.]]
@in y: int; [[The Y coordinate of the given point.]]
}
}
points_clear {

24
src/lib/evas/canvas/efl_canvas_text.eo
View File

@ -78,8 +78,8 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text, Efl.Canvas.Filter.Internal)
]]
get {}
values {
w: Evas.Coord; [[The width of the object.]]
h: Evas.Coord; [[The height of the object.]]
w: int; [[The width of the object.]]
h: int; [[The height of the object.]]
}
}
@property cursor {
@ -113,8 +113,8 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text, Efl.Canvas.Filter.Internal)
]]
get {}
values {
w: Evas.Coord; [[The width returned.]]
h: Evas.Coord; [[The height returned.]]
w: int; [[The width returned.]]
h: int; [[The height returned.]]
}
}
@property style_insets {
@ -126,10 +126,10 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text, Efl.Canvas.Filter.Internal)
]]
get {}
values {
l: Evas.Coord; [[Left padding]]
r: Evas.Coord; [[Right padding]]
t: Evas.Coord; [[Top padding]]
b: Evas.Coord; [[Bottom padding]]
l: int; [[Left padding]]
r: int; [[Right padding]]
t: int; [[Top padding]]
b: int; [[Bottom padding]]
}
}
@property is_empty {
@ -335,10 +335,10 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text, Efl.Canvas.Filter.Internal)
legacy: null;
params {
@in an: ptr(const(Efl.Canvas.Text.Annotation)); [[Given annotation to query]]
@out x: Evas.Coord; [[X coordinate of the annotation]]
@out y: Evas.Coord; [[Y coordinate of the annotation]]
@out w: Evas.Coord; [[Width of the annotation]]
@out h: Evas.Coord; [[Height of the annotation]]
@out x: int; [[X coordinate of the annotation]]
@out y: int; [[Y coordinate of the annotation]]
@out w: int; [[Width of the annotation]]
@out h: int; [[Height of the annotation]]
}
return: bool; [[$true if given annotation is an object item, $false otherwise]]
}

20
src/lib/evas/canvas/efl_canvas_text_cursor.eo
View File

@ -51,14 +51,14 @@ class Efl.Canvas.Text.Cursor (Efl.Object)
ctype: Efl.Canvas.Text.Cursor.Type; [[The type of the cursor.]]
}
values {
cx: Evas.Coord; [[The x of the cursor (or upper cursor)]]
cy: Evas.Coord; [[The y of the cursor (or upper cursor)]]
cw: Evas.Coord; [[The width of the cursor (or upper cursor)]]
ch: Evas.Coord; [[The height of the cursor (or upper cursor)]]
cx2: Evas.Coord; [[The x of the lower cursor]]
cy2: Evas.Coord; [[The y of the lower cursor]]
cw2: Evas.Coord; [[The width of the lower cursor]]
ch2: Evas.Coord; [[The height of the lower cursor]]
cx: int; [[The x of the cursor (or upper cursor)]]
cy: int; [[The y of the cursor (or upper cursor)]]
cw: int; [[The width of the cursor (or upper cursor)]]
ch: int; [[The height of the cursor (or upper cursor)]]
cx2: int; [[The x of the lower cursor]]
cy2: int; [[The y of the lower cursor]]
cw2: int; [[The width of the lower cursor]]
ch2: int; [[The height of the lower cursor]]
}
}
copy {
@ -174,8 +174,8 @@ class Efl.Canvas.Text.Cursor (Efl.Object)
[[Sets the position of the cursor according to the X and Y coordinates.]]
legacy: null;
params {
@in x: Evas.Coord; [[X coord to set by.]]
@in y: Evas.Coord; [[Y coord to set by.]]
@in x: int; [[X coord to set by.]]
@in y: int; [[Y coord to set by.]]
}
}
@property object_item_annotation {

4
src/lib/evas/canvas/evas_box.eo
View File

@ -53,8 +53,8 @@ class Evas.Box (Efl.Canvas.Group.Clipped)
See also @.padding.set.]]
}
values {
horizontal: Evas.Coord; [[The horizontal padding, in pixels.]]
vertical: Evas.Coord; [[The vertical padding, in pixels.]]
horizontal: int; [[The horizontal padding, in pixels.]]
vertical: int; [[The vertical padding, in pixels.]]
}
}
@property layout {

40
src/lib/evas/canvas/evas_canvas.eo
View File

@ -163,8 +163,8 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
dev: Efl.Input.Device; [[The pointer device.]]
}
values {
x: Evas.Coord; [[The pointer to a Evas_Coord to be filled in.]]
y: Evas.Coord; [[The pointer to a Evas_Coord to be filled in.]]
x: int; [[The pointer to a Evas_Coord to be filled in.]]
y: int; [[The pointer to a Evas_Coord to be filled in.]]
}
}
@property pointer_canvas_xy {
@ -189,8 +189,8 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
*/
}
values {
x: Evas.Coord; [[The pointer to a Evas_Coord to be filled in.]]
y: Evas.Coord; [[The pointer to a Evas_Coord to be filled in.]]
x: int; [[The pointer to a Evas_Coord to be filled in.]]
y: int; [[The pointer to a Evas_Coord to be filled in.]]
}
}
@property event_down_count {
@ -572,8 +572,8 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
The list of Evas objects that are over the given position in $e.
]]
params {
@in x: Evas.Coord; [[The horizontal coordinate of the position.]]
@in y: Evas.Coord; [[The vertical coordinate of the position.]]
@in x: int; [[The horizontal coordinate of the position.]]
@in y: int; [[The vertical coordinate of the position.]]
@in include_pass_events_objects: bool; [[
Boolean flag to include or not objects which pass events
in this calculation.
@ -696,8 +696,8 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
]]
return: Efl.Canvas.Object @warn_unused; [[The Evas object that is over all other objects at the given position.]]
params {
@in x: Evas.Coord; [[The horizontal coordinate of the position.]]
@in y: Evas.Coord; [[The vertical coordinate of the position.]]
@in x: int; [[The horizontal coordinate of the position.]]
@in y: int; [[The vertical coordinate of the position.]]
@in include_pass_events_objects: bool; [[
Boolean flag to include or not objects which pass events
in this calculation.
@ -769,10 +769,10 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
[[Get all objects in the given rectangle]]
return: list<Efl.Canvas.Object> @warn_unused; [[List of objects]]
params {
@in x: Evas.Coord; [[X coordinate]]
@in y: Evas.Coord; [[Y coordinate]]
@in w: Evas.Coord; [[Width]]
@in h: Evas.Coord; [[Height]]
@in x: int; [[X coordinate]]
@in y: int; [[Y coordinate]]
@in w: int; [[Width]]
@in h: int; [[Height]]
@in include_pass_events_objects: bool; [[$true if the list should include objects which pass events]]
@in include_hidden_objects: bool; [[$true if the list should include hidden objects]]
}
@ -886,7 +886,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
*/
return: int @warn_unused; [[The output/screen coordinate translated to output coordinates.]]
params {
@in x: Evas.Coord; [[The canvas X coordinate.]]
@in x: int; [[The canvas X coordinate.]]
}
}
render_updates {
@ -944,7 +944,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
canvas_y = evas_coord_screen_y_to_world(evas, screen_y);
@endcode
*/
return: Evas.Coord @warn_unused; [[The screen coordinate translated to canvas unit coordinates.]]
return: int @warn_unused; [[The screen coordinate translated to canvas unit coordinates.]]
params {
@in y: int; [[The screen/output y coordinate.]]
}
@ -1060,16 +1060,16 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
rectangular region.
]]
params {
@in x: Evas.Coord; [[
@in x: int; [[
The top left corner's horizontal coordinate for the
rectangular region.
]]
@in y: Evas.Coord; [[
@in y: int; [[
The top left corner's vertical coordinate for the
rectangular region.
]]
@in w: Evas.Coord; [[The width of the rectangular region.]]
@in h: Evas.Coord; [[The height of the rectangular region.]]
@in w: int; [[The width of the rectangular region.]]
@in h: int; [[The height of the rectangular region.]]
@in include_pass_events_objects: bool; [[
Boolean flag to include or not objects which pass events
in this calculation.
@ -1129,7 +1129,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
canvas_x = evas_coord_screen_x_to_world(evas, screen_x);
@endcode
*/
return: Evas.Coord @warn_unused; [[
return: int @warn_unused; [[
The screen coordinate translated to canvas unit coordinates.
]]
params {
@ -1205,7 +1205,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
*/
return: int @warn_unused; [[The output/screen coordinate translated to output coordinates.]]
params {
@in y: Evas.Coord; [[The canvas y coordinate.]]
@in y: int; [[The canvas y coordinate.]]
}
}
}

8
src/lib/evas/canvas/evas_line.eo
View File

@ -20,10 +20,10 @@ class Evas.Line (Efl.Canvas.Object)
]]
}
values {
x1: Evas.Coord; [[The X coordinate of the first point.]]
y1: Evas.Coord; [[The Y coordinate of the first point.]]
x2: Evas.Coord; [[The X coordinate of the second point.]]
y2: Evas.Coord; [[The Y coordinate of the second point.]]
x1: int; [[The X coordinate of the first point.]]
y1: int; [[The Y coordinate of the first point.]]
x2: int; [[The X coordinate of the second point.]]
y2: int; [[The Y coordinate of the second point.]]
}
}
}

4
src/lib/evas/canvas/evas_table.eo
View File

@ -82,8 +82,8 @@ class Evas.Table (Efl.Canvas.Group.Clipped)
get {
}
values {
horizontal: Evas.Coord; [[Horizontal padding]]
vertical: Evas.Coord; [[Vertical padding]]
horizontal: int; [[Horizontal padding]]
vertical: int; [[Vertical padding]]
}
}
@property mirrored {

38
src/lib/evas/canvas/evas_text.eo
View File

@ -165,7 +165,7 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi
@property max_descent {
[[Maximal descent property]]
get {
return: Evas.Coord; [[Evas coordinate]]
return: int; [[Evas coordinate]]
}
}
@property style_pad {
@ -190,37 +190,37 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi
@property ascent {
[[Ascent property]]
get {
return: Evas.Coord; [[Evas coordinate]]
return: int; [[Evas coordinate]]
}
}
@property horiz_advance {
[[Horizontal advance property]]
get {
return: Evas.Coord; [[Evas coordinate]]
return: int; [[Evas coordinate]]
}
}
@property inset {
[[Inset property]]
get {
return: Evas.Coord; [[Evas coordinate]]
return: int; [[Evas coordinate]]
}
}
@property max_ascent {
[[Maximal ascent property]]
get {
return: Evas.Coord; [[Evas coordinate]]
return: int; [[Evas coordinate]]
}
}
@property vert_advance {
[[Vertical advance property]]
get {
return: Evas.Coord; [[Evas coordinate]]
return: int; [[Evas coordinate]]
}
}
@property descent {
[[descent property]]
get {
return: Evas.Coord; [[Evas coordinate]]
return: int; [[Evas coordinate]]
}
}
last_up_to_pos @const {
@ -232,20 +232,20 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi
]]
return: int(-1); [[Logical position of the last char]]
params {
@in x: Evas.Coord; [[X coordinate]]
@in y: Evas.Coord; [[Y coordinate]]
@in x: int; [[X coordinate]]
@in y: int; [[Y coordinate]]
}
}
char_coords_get @const {
[[Get character coordinates]]
return: int; [[Logical position of char]]
params {
@in x: Evas.Coord; [[X coordinate]]
@in y: Evas.Coord; [[Y coordinate]]
@out cx: Evas.Coord; [[X coordinate]]
@out cy: Evas.Coord; [[Y coordinate]]
@out cw: Evas.Coord; [[Width]]
@out ch: Evas.Coord; [[Height]]
@in x: int; [[X coordinate]]
@in y: int; [[Y coordinate]]
@out cx: int; [[X coordinate]]
@out cy: int; [[Y coordinate]]
@out cw: int; [[Width]]
@out ch: int; [[Height]]
}
}
char_pos_get @const {
@ -259,10 +259,10 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi
return: bool; [[$false on success, $true otherwise]]
params {
@in pos: int; [[The character position to request co-ordinates for.]]
@out cx: Evas.Coord; [[A pointer to an @Evas.Coord to store the X value in (can be NULL).]]
@out cy: Evas.Coord; [[A pointer to an @Evas.Coord to store the Y value in (can be NULL).]]
@out cw: Evas.Coord; [[A pointer to an @Evas.Coord to store the Width value in (can be NULL).]]
@out ch: Evas.Coord; [[A pointer to an @Evas.Coord to store the Height value in (can be NULL).]]
@out cx: int; [[A pointer to an int to store the X value in (can be NULL).]]
@out cy: int; [[A pointer to an int to store the Y value in (can be NULL).]]
@out cw: int; [[A pointer to an int to store the Width value in (can be NULL).]]
@out ch: int; [[A pointer to an int to store the Height value in (can be NULL).]]
}
}
}

3
src/lib/evas/canvas/evas_types.eot
View File

@ -1,7 +1,4 @@
type @extern Evas.Load_Error: int; [[Evas load error type]] /* FIXME: Need to migrate emile. */
type Evas.Modifier_Mask: ullong; [[An Evas modifier mask type]]
type Evas.Coord: int; [[A type for coordinates]]
struct Evas.Modifier; [[An opaque type containing information on which modifier keys are registered in an Evas canvas]]
struct Evas.Lock; [[An opaque type containing information on which lock keys are registered in an Evas canvas]]