From 8d9e6fd2732304e012b8c740744181b13f4fabcd Mon Sep 17 00:00:00 2001 From: Bradley Cicenas Date: Sat, 18 Feb 2017 00:59:13 +0000 Subject: [PATCH] redrawrows on resize --- grid.go | 16 ++++++++-------- widgets/compact.go | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/grid.go b/grid.go index c7e99d6..fdd48db 100644 --- a/grid.go +++ b/grid.go @@ -90,9 +90,9 @@ func (g *Grid) redrawRows() { ui.Render(ui.Body) // dump aligned widget positions and sizes - for i, w := range ui.Body.Rows[1].Cols { - log.Infof("w%v: x=%v y=%v w=%v h=%v", i, w.X, w.Y, w.Width, w.Height) - } + //for i, w := range ui.Body.Rows[1].Cols { + //log.Infof("w%v: x=%v y=%v w=%v h=%v", i, w.X, w.Y, w.Width, w.Height) + //} } @@ -105,8 +105,10 @@ func resizeIndicator() { continue } wDiff := r.Cols[0].Width - (toWidth + xShift) - r.Cols[0].SetX(xShift) // set indicator width - r.Cols[0].SetWidth(toWidth) // set indicator width + // set indicator x, width + r.Cols[0].SetX(xShift) + r.Cols[0].SetWidth(toWidth) + // shift remainder of columns left by wDiff for _, c := range r.Cols[1:] { c.SetX(c.X - wDiff) @@ -217,10 +219,8 @@ func Display(g *Grid) bool { ui.Handle("/sys/wnd/resize", func(e ui.Event) { ui.Body.Width = ui.TermWidth() - ui.Body.Align() - ui.Clear() - ui.Render(ui.Body) log.Infof("resize: width=%v", ui.Body.Width) + g.redrawRows() }) ui.Loop() diff --git a/widgets/compact.go b/widgets/compact.go index 27d4d6b..a4b6c25 100644 --- a/widgets/compact.go +++ b/widgets/compact.go @@ -8,8 +8,8 @@ import ( ) const ( - mark = '\u25C9' - pause = '\u25AE' + mark = string('\u25C9') + vBar = string('\u25AE') ) type ContainerWidgets interface { @@ -70,16 +70,16 @@ func (w *Compact) UnHighlight() { func (w *Compact) SetStatus(val string) { switch val { case "running": - w.Status.Text = string(mark) + w.Status.Text = mark w.Status.TextFgColor = ui.ColorGreen case "exited": - w.Status.Text = string(mark) + w.Status.Text = mark w.Status.TextFgColor = ui.ColorRed case "paused": - w.Status.Text = fmt.Sprintf("%s%s", string(pause), string(pause)) + w.Status.Text = fmt.Sprintf("%s%s", vBar, vBar) w.Status.TextFgColor = ui.ColorDefault default: - w.Status.Text = string(mark) + w.Status.Text = mark w.Status.TextFgColor = ui.ColorRed } }