From 2961841b100ec975c26c11349772c57739d7afb4 Mon Sep 17 00:00:00 2001 From: rkfg Date: Mon, 10 Oct 2022 10:21:33 +0300 Subject: [PATCH] Fix column views init --- ui/views/channels.go | 16 +++++++++++----- ui/views/routing.go | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ui/views/channels.go b/ui/views/channels.go index 75299ab..a92429c 100644 --- a/ui/views/channels.go +++ b/ui/views/channels.go @@ -288,6 +288,17 @@ func (c *Channels) display(g *gocui.Gui) { if len(c.columnViews) == 0 { c.columnViews = make([]*gocui.View, len(c.columns)) + x0, y0, _, y1 := c.view.Dimensions() + for i := range c.columns { + width := c.columns[i].width + cc, _ := g.SetView("channel_content_"+c.columns[i].name, x0, y0, x0+width+2, y1, 0) + cc.Frame = false + cc.Autoscroll = false + cc.SelBgColor = gocui.ColorCyan + cc.SelFgColor = gocui.ColorBlack + cc.Highlight = true + c.columnViews[i] = cc + } } for ci, item := range c.channels.List() { x0, y0, _, y1 := c.view.Dimensions() @@ -303,11 +314,6 @@ func (c *Channels) display(g *gocui.Gui) { if ci == 0 { cc.Rewind() } - cc.Frame = false - cc.Autoscroll = false - cc.SelBgColor = gocui.ColorCyan - cc.SelFgColor = gocui.ColorBlack - cc.Highlight = true fmt.Fprintln(cc, c.columns[i].display(item, opt), " ") x0 += width + 1 } diff --git a/ui/views/routing.go b/ui/views/routing.go index dd48709..2d088dc 100644 --- a/ui/views/routing.go +++ b/ui/views/routing.go @@ -270,6 +270,17 @@ func (c *Routing) display(g *gocui.Gui) { } if len(c.columnViews) == 0 { c.columnViews = make([]*gocui.View, len(c.columns)) + x0, y0, _, y1 := c.view.Dimensions() + for i := range c.columns { + width := c.columns[i].width + cc, _ := g.SetView("routing_content_"+c.columns[i].name, x0, y0, x0+width+2, y1, 0) + cc.Frame = false + cc.Autoscroll = false + cc.SelBgColor = gocui.ColorCyan + cc.SelFgColor = gocui.ColorBlack + cc.Highlight = true + c.columnViews[i] = cc + } } rewind := true for ; j < numEvents; j++ { @@ -287,11 +298,6 @@ func (c *Routing) display(g *gocui.Gui) { if rewind { cc.Rewind() } - cc.Frame = false - cc.Autoscroll = false - cc.SelBgColor = gocui.ColorCyan - cc.SelFgColor = gocui.ColorBlack - cc.Highlight = true fmt.Fprintln(cc, c.columns[i].display(item, opt), " ") x0 += width + 1 }