Diff
diff --git a/docs/cstyle/plugins/inline/index.html b/docs/cstyle/plugins/inline/index.html
index 178127b..1eb51b7 100644
--- a/docs/cstyle/plugins/inline/index.html
+++ b/docs/cstyle/plugins/inline/index.html
@@ -32,92 +32,73 @@
- 6 "gui/utils"
- 7)
- 8
- 9func Init() cstyle.Plugin {
-10 return cstyle.Plugin{
-11 Styles: map[string]string{
-12 "display": "inline",
-13 },
-14 Level: 1,
-15 Handler: func(n *element.Node, state *map[string]element.State) {
-16 s := *state
-17 self := s[n.Properties.Id]
-18 parent := s[n.Parent.Properties.Id]
-19 copyOfX := self.X
-20 copyOfY := self.Y
-21 xCollect := float32(0)
-22 for i, v := range n.Parent.Children {
-23 vState := s[v.Properties.Id]
-24 if v.Style["display"] != "inline" {
-25 xCollect = 0
-26 } else {
-27 if v.Properties.Id == n.Properties.Id {
-28 if self.X+xCollect+self.Width > (parent.Width+parent.Padding.Right)+parent.X && i > 0 {
-29 // Break Node
-30 sibling := s[n.Parent.Children[i-1].Properties.Id]
-31 self.Y += sibling.Height
-32 self.X = copyOfX
-33 tallest := float32(0)
-34 endex := 0
-35 for a := i; a > 0; a-- {
-36 if s[n.Parent.Children[a].Properties.Id].Y != s[n.Parent.Children[i-1].Properties.Id].Y {
-37 endex = a
-38 break
-39 } else {
-40 tallest = utils.Max(tallest, s[n.Parent.Children[a].Properties.Id].Height)
-41 }
-42 }
-43 // !ISSUE: Find a better way then -4
-44 for a := i; a > endex-1; a-- {
-45 p := (*state)[n.Parent.Children[a].Properties.Id]
-46 if p.Height != tallest {
-47 p.Y += (tallest - p.Height) - 5
-48 (*state)[n.Parent.Children[a].Properties.Id] = p
-49 }
-50 }
-51 for a := i; a < len(n.Parent.Children)-1; a++ {
-52 p := (*state)[n.Parent.Children[a].Properties.Id]
-53 p.Y += 7
-54 (*state)[n.Parent.Children[a].Properties.Id] = p
-55 }
-56 } else if i > 0 {
-57 // Node did not break
-58 self.X += xCollect
-59 }
-60 break
-61 } else {
-62 if n.Parent.Children[i].Style["display"] == "inline" {
-63 if colliderDetection(vState, self) {
-64 xCollect += vState.Width
-65 } else {
-66 xCollect = 0
-67 }
-68 }
-69 }
-70 }
-71 }
-72 propagateOffsets(n, copyOfX, copyOfY, self, state)
-73 (*state)[n.Properties.Id] = self
-74 },
-75 }
-76}
-77
-78func propagateOffsets(n *element.Node, copyOfX, copyOfY float32, self element.State, state *map[string]element.State) {
-79 s := *state
-80 for _, v := range n.Children {
-81 vState := s[v.Properties.Id]
-82 vState.X += self.X - copyOfX
-83 vState.Y += self.Y - copyOfY
-84 if len(v.Children) > 0 {
-85 propagateOffsets(&v, copyOfX, copyOfY, self, state)
-86 }
-87 (*state)[v.Properties.Id] = vState
-88 }
-89}
-90
-91func colliderDetection(s1, s2 element.State) bool {
-92 s1Min := s1.Y
-93 s1Max := s1.Y + s1.Height
-94 s2Min := s2.Y
-95 s2Max := s2.Y + s2.Height
-96 return s1Min > s2Min && s1Min < s2Max || s1Max > s2Min && s1Min < s2Max || s2Min > s1Min && s2Min < s1Max || s2Max > s1Min && s2Min < s1Max
-97}
+ 6)
+ 7
+ 8func Init() cstyle.Plugin {
+ 9 return cstyle.Plugin{
+10 Styles: map[string]string{
+11 "display": "inline",
+12 },
+13 Level: 1,
+14 Handler: func(n *element.Node, state *map[string]element.State) {
+15 s := *state
+16 self := s[n.Properties.Id]
+17 parent := s[n.Parent.Properties.Id]
+18 copyOfX := self.X
+19 copyOfY := self.Y
+20 xCollect := float32(0)
+21 for i, v := range n.Parent.Children {
+22 vState := s[v.Properties.Id]
+23 if v.Style["display"] != "inline" {
+24 xCollect = 0
+25 } else {
+26 if v.Properties.Id == n.Properties.Id {
+27 if self.X+xCollect+self.Width > ((parent.Width-parent.Padding.Left)+parent.Padding.Right)+parent.X && i > 0 {
+28 // Break Node
+29 sibling := s[n.Parent.Children[i-1].Properties.Id]
+30 self.Y += sibling.Height
+31 self.X = copyOfX
+32 } else if i > 0 {
+33 // Node did not break
+34 self.X += xCollect
+35 // sibling := s[n.Parent.Children[i-1].Properties.Id]
+36 // if sibling.Height != self.Height {
+37 // self.Y += sibling.Height / 4
+38 // }
+39 }
+40 self.X += parent.Padding.Left
+41 break
+42 } else {
+43 if n.Parent.Children[i].Style["display"] == "inline" {
+44 if colliderDetection(vState, self) {
+45 xCollect += vState.Width
+46 } else {
+47 xCollect = 0
+48 }
+49 }
+50 }
+51 }
+52 }
+53 propagateOffsets(n, copyOfX, copyOfY, self, state)
+54 (*state)[n.Properties.Id] = self
+55 },
+56 }
+57}
+58
+59func propagateOffsets(n *element.Node, copyOfX, copyOfY float32, self element.State, state *map[string]element.State) {
+60 s := *state
+61 for _, v := range n.Children {
+62 vState := s[v.Properties.Id]
+63 vState.X += self.X - copyOfX
+64 vState.Y += self.Y - copyOfY
+65 if len(v.Children) > 0 {
+66 propagateOffsets(&v, copyOfX, copyOfY, self, state)
+67 }
+68 (*state)[v.Properties.Id] = vState
+69 }
+70}
+71
+72func colliderDetection(s1, s2 element.State) bool {
+73 s1Min := s1.Y
+74 s1Max := s1.Y + s1.Height
+75 s2Min := s2.Y
+76 s2Max := s2.Y + s2.Height
+77 return s1Min > s2Min && s1Min < s2Max || s1Max > s2Min && s1Min < s2Max || s2Min > s1Min && s2Min < s1Max || s2Max > s1Min && s2Min < s1Max
+78}
