Develop 1.8 #20

Merged
Kan18 merged 242 commits from develop-1.8 into master-1.8 2019-11-10 20:52:08 -05:00
Showing only changes of commit c18945467f - Show all commits

View File

@@ -60,14 +60,14 @@ function UI.Form:createForm()
end
if child.formLabel then
child.x = self.labelWidth + self.margin - 1
child.y = y
child.y = child.formIndex and (child.formIndex + self.margin - 1) or y
if not child.width and not child.ex then
child.ex = -self.margin
end
table.insert(self.children, UI.Text {
x = self.margin,
y = y,
y = child.y,
textColor = colors.black,
width = #child.formLabel,
value = child.formLabel,