From c1b84b563479c3e03c8184d230e771e26421a6c6 Mon Sep 17 00:00:00 2001 From: nakabonne Date: Tue, 15 Sep 2020 23:15:12 +0900 Subject: [PATCH] Enclose text boxes with border --- gui/gui.go | 14 +++++++------- gui/widgets.go | 8 ++++++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gui/gui.go b/gui/gui.go index 2445c4c..64b2ce9 100644 --- a/gui/gui.go +++ b/gui/gui.go @@ -65,16 +65,16 @@ func gridLayout(w *widgets) ([]container.Option, error) { ) raw2 := grid.RowHeightPerc(35, grid.ColWidthPerc(64, - grid.RowHeightPerc(33, grid.Widget(w.urlInput, container.Border(linestyle.None))), + grid.RowHeightPerc(33, grid.Widget(w.urlInput, container.Border(linestyle.Light), container.BorderTitle("Target URL"))), grid.RowHeightPerc(33, - grid.ColWidthPerc(33, grid.Widget(w.rateLimitInput, container.Border(linestyle.None))), - grid.ColWidthPerc(33, grid.Widget(w.durationInput, container.Border(linestyle.None))), - grid.ColWidthPerc(33, grid.Widget(w.timeoutInput, container.Border(linestyle.None))), + grid.ColWidthPerc(33, grid.Widget(w.rateLimitInput, container.Border(linestyle.Light), container.BorderTitle("Rate Limit"))), + grid.ColWidthPerc(33, grid.Widget(w.durationInput, container.Border(linestyle.Light), container.BorderTitle("Duration"))), + grid.ColWidthPerc(33, grid.Widget(w.timeoutInput, container.Border(linestyle.Light), container.BorderTitle("Timeout"))), ), grid.RowHeightPerc(33, - grid.ColWidthPerc(33, grid.Widget(w.methodInput, container.Border(linestyle.None))), - grid.ColWidthPerc(33, grid.Widget(w.headerInput, container.Border(linestyle.None))), - grid.ColWidthPerc(33, grid.Widget(w.bodyInput, container.Border(linestyle.None))), + grid.ColWidthPerc(33, grid.Widget(w.methodInput, container.Border(linestyle.Light), container.BorderTitle("Method"))), + grid.ColWidthPerc(33, grid.Widget(w.headerInput, container.Border(linestyle.Light), container.BorderTitle("Header"))), + grid.ColWidthPerc(33, grid.Widget(w.bodyInput, container.Border(linestyle.Light), container.BorderTitle("Body"))), ), ), grid.ColWidthPerc(35, grid.Widget(w.reportText, container.Border(linestyle.Light), container.BorderTitle("Report"))), diff --git a/gui/widgets.go b/gui/widgets.go index 275de3d..333763b 100644 --- a/gui/widgets.go +++ b/gui/widgets.go @@ -43,7 +43,7 @@ func newWidgets() (*widgets, error) { if err != nil { return nil, err } - urlInput, err := newTextInput("Target URL: ", "", 60) + urlInput, err := newTextInput("Target URL: ", "http://", 80) if err != nil { return nil, err } @@ -111,9 +111,13 @@ func newText(s string) (*text.Text, error) { func newTextInput(label, placeHolder string, cells int) (*textinput.TextInput, error) { return textinput.New( - textinput.Label(label, cell.FgColor(cell.ColorWhite)), + //textinput.Label(label, cell.FgColor(cell.ColorWhite)), + textinput.Border(linestyle.Double), + textinput.BorderColor(cell.ColorGreen), + textinput.FillColor(cell.ColorDefault), textinput.MaxWidthCells(cells), textinput.PlaceHolder(placeHolder), + textinput.PlaceHolderColor(cell.ColorDefault), ) }