BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-14 16:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

layout refactoring

Browse Source
This commit is contained in:
BlackMATov
2020-04-15 21:45:47 +07:00
parent cdd3007476
commit eda66d3dd5
14 changed files with 723 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/bin/library/prefabs/layout_prefab.json
View File

@@ -1,4 +1,5 @@
{
"prototype" : "widget_prefab.json",
"components" : {
"named" : {
"name" : "layout"

9
samples/bin/library/prefabs/widget_prefab.json Normal file
View File

@@ -0,0 +1,9 @@
{
"components" : {
"named" : {
"name" : "widget"
},
"widget" : {},
"widget.dirty" : {}
}
}

18
samples/bin/library/scenes/sample_09.json
View File

@@ -15,14 +15,16 @@
"prototype" : "../prefabs/layout_prefab.json",
"components" : {
"layout" : {
"size" : [400,200],
"halign" : "space_evenly"
"justify_content" : "space_evenly"
},
"widget" : {
"size" : [400,200]
}
},
"children" : [{
"prototype" : "../prefabs/layout_prefab.json",
"prototype" : "../prefabs/widget_prefab.json",
"components" : {
"layout" : {
"widget" : {
"size" : [66,113]
}
},
@@ -35,9 +37,9 @@
}
}]
},{
"prototype" : "../prefabs/layout_prefab.json",
"prototype" : "../prefabs/widget_prefab.json",
"components" : {
"layout" : {
"widget" : {
"size" : [66,113]
}
},
@@ -50,9 +52,9 @@
}
}]
},{
"prototype" : "../prefabs/layout_prefab.json",
"prototype" : "../prefabs/widget_prefab.json",
"components" : {
"layout" : {
"widget" : {
"size" : [66,113]
}
},

74
samples/bin/library/scripts/emmy/components/layout.lua
View File

@@ -9,47 +9,59 @@ local layout = {
---@type boolean
dirty = false,
---@type layout_haligns
halign = layout.haligns.center,
---@type layout_valigns
valign = layout.valigns.center,
---@type layout_directions
direction = layout.directions.row,
direction = layout.directions.ltr,
---@type v2f
size = v2f.zero(),
---@type layout_align_modes
align_items = layout.align_modes.flex_start,
---@type v2f
margin = v2f.zero(),
---@type layout_align_modes
align_conten = layout.align_modes.flex_start,
---@type v2f
padding = v2f.zero()
}
---@type layout_justify_modes
justify_content = layout.justify_modes.flex_start,
---@class layout_haligns
layout.haligns = {
left = "left",
center = "center",
right = "right",
space_around = "space_around",
space_evenly = "space_evenly",
space_between = "space_between"
}
---@type layout_flex_wraps
flex_wrap = layout.flex_wraps.no_wrap,
---@class layout_valigns
layout.valigns = {
top = "top",
center = "center",
bottom = "bottom",
space_around = "space_around",
space_evenly = "space_evenly",
space_between = "space_between"
---@type layout_flex_directions
flex_direction = layout.flex_directions.row
}
---@class layout_directions
layout.directions = {
ltr = "ltr",
rtl = "rtl"
}
---@class layout_align_modes
layout.align_modes = {
flex_start = "flex_start",
center = "center",
flex_end = "flex_end",
space_between = "space_between",
space_around = "space_around"
}
---@class layout_justify_modes
layout.justify_modes = {
flex_start = "flex_start",
center = "center",
flex_end = "flex_end",
space_between = "space_between",
space_around = "space_around",
space_evenly = "space_evenly"
}
---@class layout_flex_wraps
layout.flex_wraps = {
no_wrap = "no_wrap",
wrap = "wrap",
wrap_reversed = "wrap_reversed"
}
---@class layout_flex_directions
layout.flex_directions = {
row = "row",
row_reversed = "row_reversed",
column = "column",

8
samples/bin/library/scripts/emmy/components/widget.lua
View File

@@ -6,11 +6,17 @@ local widget = {
---@type boolean
disabled = false,
---@type boolean
dirty = false,
---@type v2f
size = v2f.zero(),
---@type v2f
pivot = v2f.unit() * 0.5
margin = v2f.zero(),
---@type v2f
padding = v2f.zero()
}
---@overload fun(self: widget)