Commits
Diff
diff --git a/cstyle/plugins/crop/main.go b/cstyle/plugins/crop/main.go
index 16ec996..6e4a22c 100644
--- a/cstyle/plugins/crop/main.go
+++ b/cstyle/plugins/crop/main.go
@@ -34,5 +34 @@ func Init() cstyle.Plugin {
-
- if diff < 0 {
- diff *= -1
- }
-
+ // !ISSUE: Scroll bar height is too small
@@ -40,4 +36 @@ func Init() cstyle.Plugin {
-
- p.Y = self.Y + ((self.Height - p.Height) * (float32(scrollTop) / (((maxY - minY) + self.Padding.Bottom + self.Padding.Top) - (self.Height))))
-
- // Not sure what this does anymore if I comment it out nothing changes but I put it here for a reason
+ p.Y += float32(scrollAmt)
package crop
import (
"gui/cstyle"
"gui/element"
"strings"
)
func Init() cstyle.Plugin {
return cstyle.Plugin{
Selector: func(n *element.Node) bool {
if n.Style["overflow"] != "" || n.Style["overflow-x"] != "" || n.Style["overflow-y"] != "" {
return true
} else {
return false
}
},
Level: 1,
Handler: func(n *element.Node, state *map[string]element.State) {
// !TODO: Needs to find crop bounds for X
s := *state
self := s[n.Properties.Id]
scrollTop := findScroll(n)
minY, maxY := findBounds(n, state)
scrollAmt := ((maxY - minY) + self.Padding.Bottom + self.Padding.Top) / self.Height
for _, v := range n.Children {
if v.TagName == "grim-scrollbar" {
if scrollAmt > 1 {
diff := 1 - (scrollAmt - 1)
p := s[v.Children[0].Properties.Id]
if diff < 0 {
diff *= -1
}
p.Height = self.Height * diff
p.Y = self.Y + ((self.Height - p.Height) * (float32(scrollTop) / (((maxY - minY) + self.Padding.Bottom + self.Padding.Top) - (self.Height))))
// Not sure what this does anymore if I comment it out nothing changes but I put it here for a reason
if self.Y+self.Height < p.Y+p.Height {
p.Y = (self.Y + self.Height) - p.Height
} else if p.Y < self.Y {
p.Y = self.Y
}
(*state)[v.Children[0].Properties.Id] = p
} else {
p := s[v.Properties.Id]
p.Hidden = true
(*state)[v.Properties.Id] = p
p = s[v.Children[0].Properties.Id]
p.Hidden = true
(*state)[v.Children[0].Properties.Id] = p
}
break
}
}
if n.Style["overflow-y"] == "hidden" || n.Style["overflow-y"] == "clip" {
scrollTop = 0
}
if n.Style["overflow-y"] == "visible" {
return
}
for _, v := range n.Children {
if v.Style["position"] == "fixed" || v.TagName == "grim-scrollbar" {
continue
}
child := s[v.Properties.Id]
if (child.Y+child.Height)-float32(scrollTop) < (self.Y) || (child.Y-float32(scrollTop)) > self.Y+self.Height {
child.Hidden = true
(*state)[v.Properties.Id] = child
} else {
child.Hidden = false
yCrop := 0
height := int(child.Height)
// !ISSUE: Text got messed up after the cropping? also in the raylib adapter with add the drawrect crop thing
if child.Y-float32(scrollTop) < (self.Y) {
yCrop = int((self.Y) - (child.Y - float32(scrollTop)))
height = int(child.Height) - yCrop
} else if (child.Y-float32(scrollTop))+child.Height > self.Y+self.Height {
diff := ((child.Y - float32(scrollTop)) + child.Height) - (self.Y + self.Height)
height = int(child.Height) - int(diff)
}
child.Crop = element.Crop{
X: 0,
Y: yCrop,
Width: int(child.Width),
Height: height,
}
(*state)[v.Properties.Id] = child
updateChildren(v, state, scrollTop)
}
}
(*state)[n.Properties.Id] = self
},
}
}
func updateChildren(n *element.Node, state *map[string]element.State, offset int) {
self := (*state)[n.Properties.Id]
self.Y -= float32(offset)
(*state)[n.Properties.Id] = self
for _, v := range n.Children {
updateChildren(v, state, offset)
}
}
func findBounds(n *element.Node, state *map[string]element.State) (float32, float32) {
s := *state
var minY, maxY float32
minY = 10e10
for _, v := range n.Children {
if strings.HasPrefix(v.TagName, "grim") {
continue
}
child := s[v.Properties.Id]
if child.Y < minY {
minY = child.Y
}
if child.Y+child.Height > maxY {
maxY = child.Y + child.Height
}
nMinY, nMaxY := findBounds(v, state)
if nMinY < minY {
minY = nMinY
}
if nMaxY > maxY {
maxY = nMaxY
}
}
return minY, maxY
}
func findScroll(n *element.Node) int {
if n.ScrollTop != 0 {
return n.ScrollTop
} else {
for _, v := range n.Children {
if v.Style["overflow"] == "" && v.Style["overflow-x"] == "" && v.Style["overflow-y"] == "" {
s := findScroll(v)
if s != 0 {
return s
}
}
}
return 0
}
}
