Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update mautrix-go and remove duplicate function

Browse Source
This commit is contained in:
Tulir Asokan
2023-01-15 15:48:12 +02:00
parent c0036f391b
commit d6c08dc134
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ui/messages/html/list.go
View File

@@ -18,12 +18,12 @@ package html
import (
"fmt"
"math"
"strings"
"go.mau.fi/mauview"
"maunium.net/go/gomuks/ui/widget"
"maunium.net/go/mautrix/format"
)
type ListEntity struct {
@@ -32,13 +32,6 @@ type ListEntity struct {
Start int
}
func digits(num int) int {
if num <= 0 {
return 0
}
return int(math.Floor(math.Log10(float64(num))) + 1)
}
func NewListEntity(ordered bool, start int, children []Entity) *ListEntity {
entity := &ListEntity{
ContainerEntity: &ContainerEntity{
@@ -54,7 +47,7 @@ func NewListEntity(ordered bool, start int, children []Entity) *ListEntity {
}
if ordered {
entity.Tag = "ol"
entity.Indent += digits(start + len(children) - 1)
entity.Indent += format.Digits(start + len(children) - 1)
}
return entity
}
@@ -81,7 +74,7 @@ func (le *ListEntity) Draw(screen mauview.Screen, ctx DrawContext) {
proxyScreen.Height = entity.Height()
if le.Ordered {
number := le.Start + i
line := fmt.Sprintf("%d. %s", number, strings.Repeat(" ", le.Indent-2-digits(number)))
line := fmt.Sprintf("%d. %s", number, strings.Repeat(" ", le.Indent-2-format.Digits(number)))
widget.WriteLine(screen, mauview.AlignLeft, line, 0, proxyScreen.OffsetY, le.Indent, le.Style)
} else {
screen.SetContent(0, proxyScreen.OffsetY, '●', nil, le.Style)
@@ -101,7 +94,7 @@ func (le *ListEntity) PlainText() string {
indent := strings.Repeat(" ", le.Indent)
if le.Ordered {
number := le.Start + i
_, _ = fmt.Fprintf(&buf, "%d. %s", number, strings.Repeat(" ", le.Indent-2-digits(number)))
_, _ = fmt.Fprintf(&buf, "%d. %s", number, strings.Repeat(" ", le.Indent-2-format.Digits(number)))
} else {
buf.WriteString("● ")
}