Add rounded edges to Rectangle

canvas/rectangle.go

@@ -13,9 +13,10 @@ var _ fyne.CanvasObject = (*Rectangle)(nil)
 type Rectangle struct {
 	baseObject
 
-	FillColor   color.Color // The rectangle fill color
-	StrokeColor color.Color // The rectangle stroke color
-	StrokeWidth float32     // The stroke width of the rectangle
+	FillColor   color.Color          // The rectangle fill color
+	StrokeColor color.Color          // The rectangle stroke color
+	StrokeWidth float32              // The stroke width of the rectangle
+	Radius      fyne.RectangleRadius // The radius of the rectangle corners
 }
 
 // Refresh causes this object to be redrawn in it's current state

canvas/rectangle_test.go

@@ -4,6 +4,7 @@ import (
 	"image/color"
 	"testing"
 
+	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
 
 	"github.com/stretchr/testify/assert"
@@ -23,3 +24,20 @@ func TestRectangle_FillColor(t *testing.T) {
 
 	assert.Equal(t, c, rect.FillColor)
 }
+
+func TestRectangle_StrokeColor(t *testing.T) {
+	orange := color.NRGBA{R: 255, G: 120, B: 0, A: 255}
+	red := color.NRGBA{R: 255, G: 0, B: 0, A: 255}
+	rect := canvas.Rectangle{
+		FillColor:   orange,
+		StrokeColor: red,
+		Radius: fyne.RectangleRadius{
+			Left:  30.0,
+			Right: 30.0,
+		},
+	}
+	rect.Resize((fyne.NewSize(300, 150)))
+
+	assert.Equal(t, red, rect.StrokeColor)
+	assert.Equal(t, float32(30.0), rect.Radius.Left)
+}

cmd/fyne_demo/tutorials/canvas.go

@@ -37,7 +37,23 @@ func canvasScreen(_ fyne.Window) fyne.CanvasObject {
 		&canvas.Rectangle{FillColor: color.NRGBA{0x80, 0, 0, 0xff},
 			StrokeColor: color.NRGBA{0xff, 0xff, 0xff, 0xff},
 			StrokeWidth: 1},
+		&canvas.Rectangle{
+			FillColor:   color.NRGBA{R: 255, G: 200, B: 0, A: 180},
+			StrokeColor: color.NRGBA{R: 255, G: 120, B: 0, A: 255},
+			StrokeWidth: 5,
+			Radius:      fyne.RectangleRadius{Left: 20.0, LeftSegments: 16, Right: 20.0, RightSegments: 16},
+		},
+		&canvas.Rectangle{
+			FillColor: color.NRGBA{R: 150, G: 0, B: 205, A: 200},
+			Radius:    fyne.RectangleRadius{Left: 45.0, Right: 45.0, RightSegments: 1},
+		},
 		&canvas.Line{StrokeColor: color.NRGBA{0, 0, 0x80, 0xff}, StrokeWidth: 5},
+		&canvas.Rectangle{
+			FillColor:   color.NRGBA{R: 255, G: 120, B: 0, A: 255},
+			StrokeColor: color.NRGBA{R: 255, G: 200, B: 0, A: 180},
+			StrokeWidth: 2,
+			Radius:      fyne.RectangleRadius{Right: 45.0, RightSegments: 24},
+		},
 		&canvas.Circle{StrokeColor: color.NRGBA{0, 0, 0x80, 0xff},
 			FillColor:   color.NRGBA{0x30, 0x30, 0x30, 0x60},
 			StrokeWidth: 2},

geometry.go

@@ -140,3 +140,12 @@ func (s Size) Subtract(v Vector2) Size {
 func (s Size) SubtractWidthHeight(width, height float32) Size {
 	return Size{s.Width - width, s.Height - height}
 }
+
+// RectangleRadius describes a radius of the 4 corners as Size
+// Max Size <= the smaller Rectangle Size
+type RectangleRadius struct {
+	Left          float32
+	LeftSegments  int32
+	Right         float32
+	RightSegments int32
+}

internal/painter/gl/context.go

@@ -21,6 +21,7 @@ type context interface {
 	DrawArrays(mode uint32, first, count int)
 	Enable(capability uint32)
 	EnableVertexAttribArray(attribute Attribute)
+	DisableVertexAttribArray(attribute Attribute)
 	GetAttribLocation(program Program, name string) Attribute
 	GetError() uint32
 	GetProgrami(program Program, param uint32) int