joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-01 07:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

text: tighten clip bounds for Editor and Label

Browse Source 
We're about to remove the extra padding from Editor. To do that, the
clipping must account for text drawing that lie outside the viewport.

With accurate clip bounds, use it for Label as well.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-10-11 14:09:53 +02:00
parent bef7c39e4c
commit f35fe407b3
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
text/editor.go
+8 -7
View File
@@ -266,9 +266,7 @@ func (e *Editor) draw(gtx *layout.Context, s *Shaper, font Font) {
X: -e.scrollOff.X + e.padLeft,
Y: -e.scrollOff.Y + e.padTop,
}
clip := image.Rectangle{
Max: image.Point{X: e.viewSize.X, Y: e.viewSize.Y},
}
clip := e.clipRect()
it := lineIterator{
Lines: e.lines,
Clip: clip,
@@ -297,9 +295,6 @@ func (e *Editor) drawCaret(gtx *layout.Context) {
}
carLine, _, carX, carY := e.layoutCaret()
clip := image.Rectangle{
Max: e.viewSize,
}
var stack op.StackOp
stack.Push(gtx.Ops)
carX -= e.carWidth / 2
@@ -312,7 +307,7 @@ func (e *Editor) drawCaret(gtx *layout.Context) {
X: -e.scrollOff.X + e.padLeft,
Y: -e.scrollOff.Y + e.padTop,
})
carRect = clip.Intersect(carRect)
carRect = e.clipRect().Intersect(carRect)
if !carRect.Empty() {
paint.PaintOp{Rect: toRectF(carRect)}.Add(gtx.Ops)
}
@@ -336,6 +331,12 @@ func (e *Editor) SetText(s string) {
e.prepend(s)
}
func (e *Editor) clipRect() image.Rectangle {
clip := textPadding(e.lines)
clip.Max = clip.Max.Add(e.viewSize)
return clip
}
func (e *Editor) scrollBounds() image.Rectangle {
var b image.Rectangle
if e.SingleLine {
text/label.go
+19 -15
View File
@@ -98,11 +98,8 @@ func (l Label) Layout(gtx *layout.Context, s *Shaper) {
}
dims := linesDimens(lines)
dims.Size = cs.Constrain(dims.Size)
padTop, padBottom := textPadding(lines)
clip := image.Rectangle{
Min: image.Point{X: -inf, Y: -padTop},
Max: image.Point{X: inf, Y: dims.Size.Y + padBottom},
}
clip := textPadding(lines)
clip.Max = clip.Max.Add(dims.Size)
it := lineIterator{
Lines: lines,
Clip: clip,
@@ -135,16 +132,23 @@ func toRectF(r image.Rectangle) f32.Rectangle {
}
}
func textPadding(lines []Line) (padTop int, padBottom int) {
if len(lines) > 0 {
first := lines[0]
if d := -first.Bounds.Min.Y - first.Ascent; d > 0 {
padTop = d.Ceil()
}
last := lines[len(lines)-1]
if d := last.Bounds.Max.Y - last.Descent; d > 0 {
padBottom = d.Ceil()
}
func textPadding(lines []Line) (padding image.Rectangle) {
if len(lines) == 0 {
return
}
first := lines[0]
if d := first.Ascent + first.Bounds.Min.Y; d < 0 {
padding.Min.Y = d.Ceil()
}
last := lines[len(lines)-1]
if d := last.Bounds.Max.Y - last.Descent; d > 0 {
padding.Max.Y = d.Ceil()
}
if d := first.Bounds.Min.X; d < 0 {
padding.Min.X = d.Ceil()
}
if d := first.Bounds.Max.X - first.Width; d > 0 {
padding.Max.X = d.Ceil()
}
return
}