all: drop deprecated pointer and clip types

Signed-off-by: Chris Waldon <[email protected]>

Author: whereswaldon

component/context-area.go

@@ -9,6 +9,7 @@ import (
 	"gioui.org/io/pointer"
 	"gioui.org/layout"
 	"gioui.org/op"
+	"gioui.org/op/clip"
 )
 
 // ContextArea is a region of the UI that responds to right-clicks
@@ -94,7 +95,7 @@ func (r *ContextArea) Layout(gtx C, w layout.Widget) D {
 		// contextual widget.
 		suppressionScrim := func() op.CallOp {
 			macro2 := op.Record(gtx.Ops)
-			pr := pointer.Rect(image.Rectangle{Min: image.Point{-1e6, -1e6}, Max: image.Point{1e6, 1e6}})
+			pr := clip.Rect(image.Rectangle{Min: image.Point{-1e6, -1e6}, Max: image.Point{1e6, 1e6}})
 			stack := pr.Push(gtx.Ops)
 			pointer.InputOp{
 				Tag:   suppressionTag,
@@ -114,7 +115,7 @@ func (r *ContextArea) Layout(gtx C, w layout.Widget) D {
 		// Lay out a scrim on top of the contextual widget to detect
 		// completed interactions with it (that should dismiss it).
 		pt := pointer.PassOp{}.Push(gtx.Ops)
-		stack := pointer.Rect(image.Rectangle{Max: r.dims.Size}).Push(gtx.Ops)
+		stack := clip.Rect(image.Rectangle{Max: r.dims.Size}).Push(gtx.Ops)
 		pointer.InputOp{
 			Tag:   dismissTag,
 			Grab:  false,
@@ -129,7 +130,7 @@ func (r *ContextArea) Layout(gtx C, w layout.Widget) D {
 
 	// Capture pointer events in the contextual area.
 	defer pointer.PassOp{}.Push(gtx.Ops).Pop()
-	defer pointer.Rect(image.Rectangle{Max: gtx.Constraints.Min}).Push(gtx.Ops).Pop()
+	defer clip.Rect(image.Rectangle{Max: gtx.Constraints.Min}).Push(gtx.Ops).Pop()
 	pointer.InputOp{
 		Tag:   r,
 		Grab:  false,

component/nav_drawer.go

@@ -66,7 +66,7 @@ func (n *renderNavItem) Layout(gtx layout.Context, th *material.Theme) layout.Di
 		}
 	}
 	defer pointer.PassOp{}.Push(gtx.Ops).Pop()
-	defer pointer.Rect(image.Rectangle{
+	defer clip.Rect(image.Rectangle{
 		Max: gtx.Constraints.Max,
 	}).Push(gtx.Ops).Pop()
 	pointer.InputOp{

component/resizer.go

@@ -7,6 +7,7 @@ import (
 	"gioui.org/io/pointer"
 	"gioui.org/layout"
 	"gioui.org/op"
+	"gioui.org/op/clip"
 )
 
 // Resize provides a draggable handle in between two widgets for resizing their area.
@@ -74,7 +75,7 @@ func (f *float) Layout(gtx layout.Context, axis layout.Axis, w layout.Widget) la
 	}
 
 	rect := image.Rectangle{Max: dims.Size}
-	defer pointer.Rect(rect).Push(gtx.Ops).Pop()
+	defer clip.Rect(rect).Push(gtx.Ops).Pop()
 	f.drag.Add(gtx.Ops)
 	cursor := pointer.CursorRowResize
 	if axis == layout.Horizontal {

component/sheet.go

@@ -9,6 +9,7 @@ import (
 	"gioui.org/io/pointer"
 	"gioui.org/layout"
 	"gioui.org/op"
+	"gioui.org/op/clip"
 	"gioui.org/unit"
 	"gioui.org/widget/material"
 )
@@ -127,7 +128,7 @@ func (s *ModalSheet) LayoutModal(contents func(gtx layout.Context, th *material.
 
 		// Beneath sheet content, listen for tap events. This prevents taps in the
 		// empty sheet area from passing downward to the scrim underneath it.
-		pr := pointer.Rect(image.Rectangle{Max: gtx.Constraints.Max})
+		pr := clip.Rect(image.Rectangle{Max: gtx.Constraints.Max})
 		defer pr.Push(gtx.Ops).Pop()
 		pointer.InputOp{
 			Tag:   s,
@@ -141,7 +142,7 @@ func (s *ModalSheet) LayoutModal(contents func(gtx layout.Context, th *material.
 
 		// On top of sheet content, listen for drag events to close the sheet.
 		defer pointer.PassOp{}.Push(gtx.Ops).Pop()
-		defer pointer.Rect(image.Rectangle{Max: gtx.Constraints.Max}).Push(gtx.Ops).Pop()
+		defer clip.Rect(image.Rectangle{Max: gtx.Constraints.Max}).Push(gtx.Ops).Pop()
 		s.drag.Add(gtx.Ops)
 
 		return dims

component/text_field.go

@@ -338,7 +338,7 @@ func (in *TextField) Layout(gtx C, th *material.Theme, hint string) D {
 				}),
 				layout.Expanded(func(gtx C) D {
 					defer pointer.PassOp{}.Push(gtx.Ops).Pop()
-					defer pointer.Rect(image.Rectangle{
+					defer clip.Rect(image.Rectangle{
 						Max: gtx.Constraints.Min,
 					}).Push(gtx.Ops).Pop()
 					in.click.Add(gtx.Ops)

component/tooltip.go

@@ -209,7 +209,7 @@ func (t *TipArea) Layout(gtx C, tip Tooltip, w layout.Widget) D {
 		layout.Stacked(w),
 		layout.Expanded(func(gtx C) D {
 			defer pointer.PassOp{}.Push(gtx.Ops).Pop()
-			defer pointer.Rect(image.Rectangle{Max: gtx.Constraints.Min}).Push(gtx.Ops).Pop()
+			defer clip.Rect(image.Rectangle{Max: gtx.Constraints.Min}).Push(gtx.Ops).Pop()
 			pointer.InputOp{
 				Tag:   t,
 				Types: pointer.Press | pointer.Release | pointer.Enter | pointer.Leave,

outlay/table.go

@@ -59,7 +59,7 @@ func (t *Table) Layout(gtx layout.Context, xn, yn int, el Cell) layout.Dimension
 	// Grab all scroll events for the lists.
 	xMin, xMax := listScrollBounds(t.xList.Position, xn)
 	yMin, yMax := listScrollBounds(t.yList.Position, yn)
-	pr := pointer.Rect(image.Rectangle{Max: csMax}).Push(gtx.Ops)
+	pr := clip.Rect(image.Rectangle{Max: csMax}).Push(gtx.Ops)
 	pointer.InputOp{
 		Tag:   t,
 		Types: pointer.Press | pointer.Drag | pointer.Release | pointer.Scroll,

richtext/richtext.go

@@ -12,6 +12,7 @@ import (
 	"gioui.org/io/pointer"
 	"gioui.org/layout"
 	"gioui.org/op"
+	"gioui.org/op/clip"
 	"gioui.org/op/paint"
 	"gioui.org/text"
 	"gioui.org/unit"
@@ -292,7 +293,7 @@ func (t TextStyle) Layout(gtx layout.Context) layout.Dimensions {
 				// set this offset to the upper corner of the text, not the lower
 				shape.offset.Y -= lineDims.Y
 				offStack := op.Offset(layout.FPt(shape.offset)).Push(gtx.Ops)
-				pr := pointer.Rect(image.Rectangle{Max: shape.size}).Push(gtx.Ops)
+				pr := clip.Rect(image.Rectangle{Max: shape.size}).Push(gtx.Ops)
 				state.Layout(gtx)
 				pointer.CursorNameOp{Name: pointer.CursorPointer}.Add(gtx.Ops)
 				pr.Pop()