diff --git a/cstyle/plugins/inline/main.go b/cstyle/plugins/inline/main.go
index 699eeaf..1beb0f1 100644
--- a/cstyle/plugins/inline/main.go
+++ b/cstyle/plugins/inline/main.go
@@ -20,0 +21 @@ func Init() cstyle.Plugin {
+ // !ISSUE: Text doesn't break word
@@ -27,2 +28,8 @@ func Init() cstyle.Plugin {
- if self.X+xCollect+self.Width > ((parent.Width-parent.Padding.Left)+parent.Padding.Right)+parent.X && i > 0 {
- // Break Node
+ // then if the x coordinate of the current element plus the x shift from its prevous siblings and the width minus 2 pixels
+ // is greater than the width of the parent plus it's x value
+ // and it is not the first element
+ if self.X+xCollect+self.Width > parent.Width+parent.X && i > 0 {
+ // We need to shift the element
+ // then find the prevous sibling and add its height to the Y value to shift it downwards
+ // shift the element to the base x (which should be the parent x value) and reset the xCollect
+ // fmt.Println(n.Properties.Id, "broke", xCollect, self.X, self.Width, parent.Width, parent.X)
@@ -33 +40 @@ func Init() cstyle.Plugin {
- // Node did not break
+ // fmt.Println(n.Properties.Id, n.InnerText, "did not break", xCollect, self.X, self.Width, parent.Width)
@@ -35,4 +42,4 @@ func Init() cstyle.Plugin {
- // sibling := s[n.Parent.Children[i-1].Properties.Id]
- // if sibling.Height != self.Height {
- // self.Y += sibling.Height / 4
- // }
+ sibling := s[n.Parent.Children[i-1].Properties.Id]
+ if sibling.Height != self.Height {
+ self.Y += sibling.Height / 4
+ }
@@ -40 +46,0 @@ func Init() cstyle.Plugin {
- self.X += parent.Padding.Left
package inline
import (
"gui/cstyle"
"gui/element"
)
func Init() cstyle.Plugin {
return cstyle.Plugin{
Styles: map[string]string{
"display": "inline",
},
Level: 1,
Handler: func(n *element.Node, state *map[string]element.State) {
s := *state
self := s[n.Properties.Id]
parent := s[n.Parent.Properties.Id]
copyOfX := self.X
copyOfY := self.Y
xCollect := float32(0)
for i, v := range n.Parent.Children {
vState := s[v.Properties.Id]
if v.Style["display"] != "inline" {
xCollect = 0
} else {
if v.Properties.Id == n.Properties.Id {
if self.X+xCollect+self.Width > ((parent.Width-parent.Padding.Left)+parent.Padding.Right)+parent.X && i > 0 {
// Break Node
sibling := s[n.Parent.Children[i-1].Properties.Id]
self.Y += sibling.Height
self.X = copyOfX
} else if i > 0 {
// Node did not break
self.X += xCollect
// sibling := s[n.Parent.Children[i-1].Properties.Id]
// if sibling.Height != self.Height {
// self.Y += sibling.Height / 4
// }
}
self.X += parent.Padding.Left
break
} else {
if n.Parent.Children[i].Style["display"] == "inline" {
if colliderDetection(vState, self) {
xCollect += vState.Width
} else {
xCollect = 0
}
}
}
}
}
propagateOffsets(n, copyOfX, copyOfY, self, state)
(*state)[n.Properties.Id] = self
},
}
}
func propagateOffsets(n *element.Node, copyOfX, copyOfY float32, self element.State, state *map[string]element.State) {
s := *state
for _, v := range n.Children {
vState := s[v.Properties.Id]
vState.X += self.X - copyOfX
vState.Y += self.Y - copyOfY
if len(v.Children) > 0 {
propagateOffsets(&v, copyOfX, copyOfY, self, state)
}
(*state)[v.Properties.Id] = vState
}
}
func colliderDetection(s1, s2 element.State) bool {
s1Min := s1.Y
s1Max := s1.Y + s1.Height
s2Min := s2.Y
s2Max := s2.Y + s2.Height
return s1Min > s2Min && s1Min < s2Max || s1Max > s2Min && s1Min < s2Max || s2Min > s1Min && s2Min < s1Max || s2Max > s1Min && s2Min < s1Max
}