Add alignment for RichText ImageSegment

Fixes fyne-io#3810
andydotxyz · Jul 24, 2023 · bd8ca23 · bd8ca23
1 parent dd3155c
commit bd8ca23
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/cmd/fyne_demo/tutorials/widget.go b/cmd/fyne_demo/tutorials/widget.go
@@ -192,6 +192,7 @@ This styled row should also wrap as expected, but only *when required*.
 
 > An interesting quote here, most likely sharing some very interesting wisdom.`)
 	rich.Scroll = container.ScrollBoth
+	rich.Segments[2].(*widget.ImageSegment).Alignment = fyne.TextAlignTrailing
 
 	radioAlign := widget.NewRadioGroup([]string{"Text Alignment Leading", "Text Alignment Center", "Text Alignment Trailing"}, func(s string) {
 		var align fyne.TextAlign

diff --git a/widget/markdown.go b/widget/markdown.go
@@ -199,7 +199,7 @@ func makeImage(n *ast.Image) *ImageSegment {
 	if err != nil {
 		u = storage.NewFileURI(dest)
 	}
-	return &ImageSegment{Source: u, Title: string(n.Title)}
+	return &ImageSegment{Source: u, Title: string(n.Title), Alignment: fyne.TextAlignCenter}
 }
 
 func makeLink(n *ast.Link) *HyperlinkSegment {

diff --git a/widget/richtext_objects.go b/widget/richtext_objects.go
@@ -8,6 +8,7 @@ import (
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/internal/scale"
+	"fyne.io/fyne/v2/layout"
 	"fyne.io/fyne/v2/theme"
 )
 
@@ -166,6 +167,10 @@ func (h *HyperlinkSegment) Unselect() {
 type ImageSegment struct {
 	Source fyne.URI
 	Title  string
+
+	// Alignment specifies the horizontal alignment of this image segment
+	// Since: 2.4
+	Alignment fyne.TextAlign
 }
 
 // Inline returns false as images in rich text are blocks.
@@ -180,7 +185,7 @@ func (i *ImageSegment) Textual() string {
 
 // Visual returns the image widget required to render this segment.
 func (i *ImageSegment) Visual() fyne.CanvasObject {
-	return newRichImage(i.Source)
+	return newRichImage(i.Source, i.Alignment)
 }
 
 // Update applies the current state of this image segment to an existing visual.
@@ -191,6 +196,7 @@ func (i *ImageSegment) Update(o fyne.CanvasObject) {
 	// one of the following will be used
 	img.img.File = newer.File
 	img.img.Resource = newer.Resource
+	img.setAlign(i.Alignment)
 
 	img.Refresh()
 }
@@ -452,20 +458,26 @@ func (t *TextSegment) size() float32 {
 
 type richImage struct {
 	BaseWidget
-	img    *canvas.Image
-	oldMin fyne.Size
+	align      fyne.TextAlign
+	img        *canvas.Image
+	oldMin     fyne.Size
+	pad1, pad2 fyne.CanvasObject
 }
 
-func newRichImage(u fyne.URI) *richImage {
+func newRichImage(u fyne.URI, align fyne.TextAlign) *richImage {
 	img := canvas.NewImageFromURI(u)
 	img.FillMode = canvas.ImageFillOriginal
-	i := &richImage{img: img}
+	i := &richImage{img: img, align: align}
 	i.ExtendBaseWidget(i)
 	return i
 }
 
 func (r *richImage) CreateRenderer() fyne.WidgetRenderer {
-	return NewSimpleRenderer(r.img)
+	r.pad1 = layout.NewSpacer()
+	r.pad2 = layout.NewSpacer()
+	c := &fyne.Container{Layout: layout.NewHBoxLayout(), Objects: []fyne.CanvasObject{r.pad1, r.img, r.pad2}}
+	r.setAlign(r.align)
+	return NewSimpleRenderer(c)
 }
 
 func (r *richImage) MinSize() fyne.Size {
@@ -482,6 +494,16 @@ func (r *richImage) MinSize() fyne.Size {
 	return fyne.NewSize(float32(w)/2, float32(h)/2)
 }
 
+func (r *richImage) setAlign(a fyne.TextAlign) {
+	if a == fyne.TextAlignLeading && r.pad1 != nil {
+		r.pad1.Hide()
+	}
+	if a == fyne.TextAlignTrailing && r.pad2 != nil {
+		r.pad2.Hide()
+	}
+	r.align = a
+}
+
 type unpadTextWidgetLayout struct {
 }