tomo/x
tomo/x
Archived
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases 18 Wiki Activity

Fix scroll behavior for ContainerBox

Browse Source
This commit is contained in:
Sasha Koshka 2024-05-13 19:35:03 -04:00
parent 664ce5f556
commit 96fa7b5623
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
containerbox.go
View File

@ -274,7 +274,7 @@ func (this *containerBox) doLayout () {
// offset the content bounds by the scroll so children can be positioned // offset the content bounds by the scroll so children can be positioned
// accordingly. // accordingly.
this.constrainScroll() this.constrainScroll()
this.contentBounds = this.contentBounds.Sub(this.scroll).Sub(innerBounds.Min) this.contentBounds = this.contentBounds.Add(this.scroll).Sub(innerBounds.Min)
// arrange children // arrange children
if this.layout != nil { if this.layout != nil {
@ -294,19 +294,19 @@ func (this *containerBox) constrainScroll () {
// X // X
if width <= innerBounds.Dx() { if width <= innerBounds.Dx() {
this.scroll.X = 0 this.scroll.X = 0
} else if this.scroll.X < 0 { } else if this.scroll.X > 0 {
this.scroll.X = 0 this.scroll.X = 0
} else if this.scroll.X > width - innerBounds.Dx() { } else if this.scroll.X < innerBounds.Dx() - width {
this.scroll.X = width - innerBounds.Dx() this.scroll.X = innerBounds.Dx() - width
} }
// Y // Y
if height <= innerBounds.Dy() { if height <= innerBounds.Dy() {
this.scroll.Y = 0 this.scroll.Y = 0
} else if this.scroll.Y < 0 { } else if this.scroll.Y > 0 {
this.scroll.Y = 0 this.scroll.Y = 0
} else if this.scroll.Y > height - innerBounds.Dy() { } else if this.scroll.Y < innerBounds.Dy() - height {
this.scroll.Y = height - innerBounds.Dy() this.scroll.Y = innerBounds.Dy() - height
} }
} }