Project_Lunta/Syndie_GUI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DRY on new labels with wrapping

Browse Source
This commit is contained in:
aargh
2020-07-25 19:44:23 -04:00
parent eedfdb22fc
commit 7f81a47143
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
channels.go
View File

@ -124,17 +124,13 @@ func (client *GUI) renderContentArea() fyne.CanvasObject {
}
}
if currentMessage.Subject != "" {
subject := widget.NewLabel("Subject: " + currentMessage.Subject)
subject.Wrapping = fyne.TextWrapBreak
client.contentPane.Append(subject)
client.contentPane.Append(newLabel("Subject: " + currentMessage.Subject))
client.contentPane.Append(canvas.NewLine(color.White))
if len(currentMessage.Raw.Page) > 0 {
for num, p := range currentMessage.Raw.Page[:1] {
if num >= 0 {
client.contentPane.Append(widget.NewLabel("Page: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Page)-1)))
page := widget.NewLabel(p.Data)
page.Wrapping = fyne.TextWrapBreak
client.contentPane.Append(page)
client.contentPane.Append(newLabel("Page: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Page)-1)))
client.contentPane.Append(newLabel(p.Data))
client.contentPane.Append(canvas.NewLine(color.White))
}
}
@ -142,12 +138,8 @@ func (client *GUI) renderContentArea() fyne.CanvasObject {
if len(currentMessage.Raw.Attachment) > 0 {
for num, a := range currentMessage.Raw.Attachment {
if num >= 0 {
a1 := widget.NewLabel("Attachment: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Attachment)) + " Name: " + a.Name)
a1.Wrapping = fyne.TextWrapBreak
a2 := widget.NewLabel("Type: " + a.ContentType + " Description: " + a.Description)
a2.Wrapping = fyne.TextWrapBreak
client.contentPane.Append(a1)
client.contentPane.Append(a2)
client.contentPane.Append(newLabel("Attachment: " + strconv.Itoa(num+1) + "/" + strconv.Itoa(len(currentMessage.Raw.Attachment)) + " Name: " + a.Name))
client.contentPane.Append(newLabel("Type: " + a.ContentType + " Description: " + a.Description))
adata := a.Data
image, err := renderImage(imageExtFromName(a.ContentType), adata)
if err != nil {

7
widgets.go
View File

@ -19,6 +19,7 @@ func newTappableLabel(text string) *tappableLabel {
label := &tappableLabel{}
label.ExtendBaseWidget(label)
label.SetText(text)
label.Wrapping = fyne.TextWrapBreak
return label
}
@ -35,3 +36,9 @@ func (t *tappableLabel) Tapped(_ *fyne.PointEvent) {
func (t *tappableLabel) TappedSecondary(_ *fyne.PointEvent) {
}
func newLabel(s string) *widget.Label {
w := widget.NewLabel(s)
w.Wrapping = fyne.TextWrapBreak
return w
}