containerbox.go

@@ -59,7 +59,7 @@ func (this *containerBox) ContentBounds () image.Rectangle {
 }
 
 func (this *containerBox) ScrollTo (point image.Point) {
-	if this.scroll == point { return }
+	// TODO: constrain scroll
 	this.scroll = point
 	this.invalidateLayout()
 }
@@ -68,19 +68,19 @@ func (this *containerBox) OnContentBoundsChange (callback func()) event.Cookie {
 	return this.on.contentBoundsChange.Connect(callback)
 }
 
-func (this *containerBox) CaptureDND (capture bool) {
+func (this *containerBox)  CaptureDND (capture bool) {
 	this.capture[eventCategoryDND] = capture
 }
 
-func (this *containerBox) CaptureMouse (capture bool) {
+func (this *containerBox)  CaptureMouse (capture bool) {
 	this.capture[eventCategoryMouse] = capture
 }
 
-func (this *containerBox) CaptureScroll (capture bool) {
+func (this *containerBox)  CaptureScroll (capture bool) {
 	this.capture[eventCategoryScroll] = capture
 }
 
-func (this *containerBox) CaptureKeyboard (capture bool) {
+func (this *containerBox)  CaptureKeyboard (capture bool) {
 	this.capture[eventCategoryKeyboard] = capture
 }
 
@@ -225,14 +225,10 @@ func (this *containerBox) notifyMinimumSizeChange (child anyBox) {
 	}
 }
 
-func (this *containerBox) boundedLayoutHints () tomo.LayoutHints {
-	hints := this.layoutHints()
-	hints.Bounds = this.ContentBounds().Add(this.InnerBounds().Min)
-	return hints
-}
-
 func (this *containerBox) layoutHints () tomo.LayoutHints {
+	innerBounds := this.InnerBounds().Sub(this.scroll)
 	return tomo.LayoutHints {
+		Bounds:    innerBounds,
 		OverflowX: this.hOverflow,
 		OverflowY: this.vOverflow,
 		AlignX:    this.hAlign,
@@ -244,12 +240,10 @@ func (this *containerBox) layoutHints () tomo.LayoutHints {
 func (this *containerBox) contentMinimum () image.Point {
 	minimum := this.box.contentMinimum()
 	if this.layout != nil {
-		layoutMinimum := this.layout.MinimumSize (
-			this.boundedLayoutHints(),
-			this.children)
-		if this.hOverflow { layoutMinimum.X = 0 }
-		if this.vOverflow { layoutMinimum.Y = 0 }
-		minimum = minimum.Add(layoutMinimum)
+		minimum = minimum.Add (
+			this.layout.MinimumSize (
+				this.layoutHints(),
+				this.children))
 	}
 	return minimum
 }
@@ -257,59 +251,14 @@ func (this *containerBox) contentMinimum () image.Point {
 func (this *containerBox) doLayout () {
 	this.box.doLayout()
 	previousContentBounds := this.contentBounds
-
-	// by default, use innerBounds for contentBounds. if a direction
-	// overflows, use the layout's minimum size for it.
-	var minimum image.Point
 	if this.layout != nil {
-		minimum = this.layout.MinimumSize (
-			this.layoutHints(),
-			this.children)
+		this.layout.Arrange(this.layoutHints(), this.children)
 	}
-	innerBounds := this.InnerBounds()
-	this.contentBounds = innerBounds
-	if this.hOverflow { this.contentBounds.Max.X = this.contentBounds.Min.X + minimum.X }
-	if this.vOverflow { this.contentBounds.Max.Y = this.contentBounds.Min.Y + minimum.Y }
-
-	// offset the content bounds by the scroll so children can be positioned
-	// accordingly.
-	this.constrainScroll()
-	this.contentBounds = this.contentBounds.Add(this.scroll).Sub(innerBounds.Min)
-	
-	// arrange children
-	if this.layout != nil {
-		this.layout.Arrange(this.boundedLayoutHints(), this.children)
-	}
-	
 	if previousContentBounds != this.contentBounds {
 		this.on.contentBoundsChange.Broadcast()
 	}
 }
 
-func (this *containerBox) constrainScroll () {
-	innerBounds := this.InnerBounds()
-	width  := this.contentBounds.Dx()
-	height := this.contentBounds.Dy()
-
-	// X
-	if width <= innerBounds.Dx() {
-		this.scroll.X = 0
-	} else if this.scroll.X > 0 {
-		this.scroll.X = 0
-	} else if this.scroll.X < innerBounds.Dx() - width  {
-		this.scroll.X =  innerBounds.Dx() - width
-	}
-
-	// Y
-	if height <= innerBounds.Dy() {
-		this.scroll.Y = 0
-	} else if this.scroll.Y > 0 {
-		this.scroll.Y = 0
-	} else if this.scroll.Y < innerBounds.Dy() - height {
-		this.scroll.Y = innerBounds.Dy() - height
-	}
-}
-
 func (this *containerBox) recursiveRedo () {
 	this.doLayout()
 	this.doDraw()

textbox.go

@@ -222,7 +222,7 @@ func (this *textBox) drawDot (can canvas.Canvas) {
 
 func (this *textBox) textOffset () image.Point {
 	return this.InnerBounds().Min.
-		Add(this.scroll).
+		Sub(this.scroll).
 		Sub(this.drawer.LayoutBoundsSpace().Min)
 }
 
@@ -294,7 +294,6 @@ func (this *textBox) doLayout () {
 	this.contentBounds = this.normalizedLayoutBoundsSpace()
 	this.constrainScroll()
 	this.contentBounds = this.contentBounds.Add(this.scroll)
-	// println(this.InnerBounds().String(), this.contentBounds.String())
 
 	if previousContentBounds != this.contentBounds {
 		this.on.contentBoundsChange.Broadcast()
@@ -309,19 +308,19 @@ func (this *textBox) constrainScroll () {
 	// X
 	if width <= innerBounds.Dx() {
 		this.scroll.X = 0
-	} else if this.scroll.X > 0 {
+	} else if this.scroll.X < 0 {
 		this.scroll.X = 0
-	} else if this.scroll.X < innerBounds.Dx() - width  {
-		this.scroll.X =  innerBounds.Dx() - width
+	} else if this.scroll.X > width - innerBounds.Dx() {
+		this.scroll.X = width - innerBounds.Dx()
 	}
 
 	// Y
 	if height <= innerBounds.Dy() {
 		this.scroll.Y = 0
-	} else if this.scroll.Y > 0 {
+	} else if this.scroll.Y < 0 {
 		this.scroll.Y = 0
-	} else if this.scroll.Y < innerBounds.Dy() - height {
-		this.scroll.Y = innerBounds.Dy() - height
+	} else if this.scroll.Y > height - innerBounds.Dy() {
+		this.scroll.Y = height - innerBounds.Dy()
 	}
 }
 
@@ -334,16 +333,16 @@ func (this *textBox) scrollToDot () {
 
 	// X
 	if dot.X < innerBounds.Min.X + em {
-		scroll.X += innerBounds.Min.X - dot.X + em
+		scroll.X -= innerBounds.Min.X - dot.X + em
 	} else if dot.X > innerBounds.Max.X - em {
-		scroll.X -= dot.X - innerBounds.Max.X + em
+		scroll.X += dot.X - innerBounds.Max.X + em
 	}
 
 	// Y
 	if dot.Y < innerBounds.Min.Y + lineHeight {
-		scroll.Y += innerBounds.Min.Y - dot.Y + lineHeight
+		scroll.Y -= innerBounds.Min.Y - dot.Y + lineHeight
 	} else if dot.Y > innerBounds.Max.Y - lineHeight {
-		scroll.Y -= dot.Y - innerBounds.Max.Y + lineHeight
+		scroll.Y += dot.Y - innerBounds.Max.Y + lineHeight
 	}
 	
 	this.ScrollTo(scroll)