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

widget: fix Editor and Label clipping

Browse Source 
Commit gioui.org/commit/94d242d18c9245 broke Editor and Label clipping,
most visible for single-line Editors. Restore the correct clipping.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-12-06 22:57:11 +01:00
parent 9b8e847a05
commit ede632b265
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/editor.go
+5 -4
View File
@@ -146,7 +146,7 @@ type SubmitEvent struct {
}
type line struct {
offset f32.Point
offset image.Point
clip op.CallOp
}
@@ -447,12 +447,13 @@ func (e *Editor) layout(gtx layout.Context) layout.Dimensions {
}
func (e *Editor) PaintText(gtx layout.Context) {
clip := textPadding(e.lines)
clip.Max = clip.Max.Add(e.viewSize)
cl := textPadding(e.lines)
cl.Max = cl.Max.Add(e.viewSize)
for _, shape := range e.shapes {
stack := op.Push(gtx.Ops)
op.Offset(shape.offset).Add(gtx.Ops)
op.Offset(layout.FPt(shape.offset)).Add(gtx.Ops)
shape.clip.Add(gtx.Ops)
clip.Rect(cl.Sub(shape.offset)).Add(gtx.Ops)
paint.PaintOp{}.Add(gtx.Ops)
stack.Pop()
}