From bc6ea7851bf5becf350625a8c88a3c532b2e3132 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Wed, 8 May 2024 08:22:21 -0700 Subject: [PATCH 1/2] add SizeName to Hyperlink --- widget/hyperlink.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/widget/hyperlink.go b/widget/hyperlink.go index 899eb10b0b..d90537135b 100644 --- a/widget/hyperlink.go +++ b/widget/hyperlink.go @@ -23,11 +23,17 @@ type Hyperlink struct { Alignment fyne.TextAlign // The alignment of the Text Wrapping fyne.TextWrap // The wrapping of the Text TextStyle fyne.TextStyle // The style of the hyperlink text + // The truncation mode of the hyperlink // // Since: 2.5 Truncation fyne.TextTruncation + // The theme size name for the text size of the hyperlink + // + // Since: 2.5 + SizeName fyne.ThemeSizeName + // OnTapped overrides the default `fyne.OpenURL` call when the link is tapped // // Since: 2.2 @@ -283,7 +289,12 @@ func (hl *Hyperlink) syncSegments() { segment.Style.TextStyle = hl.TextStyle segment.Text = hl.Text - hl.textSize = fyne.MeasureText(hl.Text, th.Size(theme.SizeNameText), hl.TextStyle) + sizeName := hl.SizeName + if sizeName == "" { + sizeName = theme.SizeNameText + } + segment.Style.SizeName = sizeName + hl.textSize = fyne.MeasureText(hl.Text, th.Size(sizeName), hl.TextStyle) } var _ fyne.WidgetRenderer = (*hyperlinkRenderer)(nil) From f2e6c046c53ce6a9ece514eb50f82aef5a87fdb0 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Thu, 23 May 2024 09:04:09 -0700 Subject: [PATCH 2/2] fix bad merge --- widget/hyperlink.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widget/hyperlink.go b/widget/hyperlink.go index d69943653f..ae1cb7bac6 100644 --- a/widget/hyperlink.go +++ b/widget/hyperlink.go @@ -292,7 +292,7 @@ func (hl *Hyperlink) syncSegments() { if sizeName == "" { sizeName = theme.SizeNameText } - segment.Style.SizeName = sizeName + hl.provider.Segments[0].(*TextSegment).Style.SizeName = sizeName hl.textSize = fyne.MeasureText(hl.Text, th.Size(sizeName), hl.TextStyle) }