arindy/ArinDash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust grid layout and refine Calendar widget rendering

Browse Source
This commit is contained in:
Arindy 2025-12-28 21:32:07 +01:00
parent a0be24b074
commit e1482a152e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@ -74,14 +74,14 @@ func layout() []container.Option {
container.BorderColor(cell.ColorWhite),
),
),
grid.RowHeightFixed(11,
grid.RowHeightFixed(12,
grid.Widget(widgets.Get["PiHole"],
container.BorderTitle("pi-hole"),
container.Border(linestyle.Light),
container.BorderColor(cell.ColorWhite),
),
),
grid.RowHeightFixed(25,
grid.RowHeightFixed(24,
grid.Widget(widgets.Get["PiHoleBlocked"],
container.BorderTitle("pi-hole (Blocked Percent)"),
container.Border(linestyle.Light),
@ -92,8 +92,8 @@ func layout() []container.Option {
grid.Widget(widgets.Get["empty"]),
),
),
grid.ColWidthPerc(10,
grid.RowHeightFixed(19,
grid.ColWidthPerc(13,
grid.RowHeightFixed(20,
grid.Widget(widgets.Get["Calendar"],
container.BorderTitle("Calendar"),
container.Border(linestyle.Light),

12
widgets/calendar.go
View File

@ -32,7 +32,7 @@ func createCalendar(ctx context.Context, _ terminalapi.Terminal, _ interface{})
if err := widget.Write(fmt.Sprintf("|%-20s|\n", time.Now().Format("January 2006")), text.WriteCellOpts(cell.FgColor(cell.ColorWhite))); err != nil {
return err
}
if err := widget.Write("├────────────────────┤\n", text.WriteCellOpts(cell.FgColor(cell.ColorWhite))); err != nil {
if err := widget.Write("├──┬──┬──┬──┬──┬──┬──┤\n", text.WriteCellOpts(cell.FgColor(cell.ColorWhite))); err != nil {
return err
}
if err := createRow(widget, "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"); err != nil {
@ -78,7 +78,7 @@ func createTableForMonth(widget *text.Text) error {
}
}
var str string
if err := widget.Write("|"); err != nil {
if err := widget.Write("│"); err != nil {
return err
}
if field == 0 {
@ -96,7 +96,7 @@ func createTableForMonth(widget *text.Text) error {
return err
}
if index%7 == 6 {
if err := widget.Write("|\n"); err != nil {
if err := widget.Write("│\n"); err != nil {
return err
}
}
@ -129,13 +129,13 @@ func createMiddle(widget *text.Text) error {
}
func createRow(widget *text.Text, cells ...string) error {
result := "|"
result := "│"
for index, field := range cells {
result += fmt.Sprintf("%2s", field)
if index < len(cells)-1 {
result += "|"
result += "│"
} else {
result += "|\n"
result += "│\n"
}
}
if err := widget.Write(result, text.WriteCellOpts(cell.FgColor(cell.ColorWhite))); err != nil {