Merge b49e3b6359 into 5f07813844

checkbox.go

@@ -23,6 +23,9 @@ type Checkbox struct {
 	// The text to be displayed before the input area.
 	label string
 
+	// The text to be displayed after the checkbox
+	message string
+
 	// The screen width of the label area. A value of 0 means use the width of
 	// the label text.
 	labelWidth int
@@ -92,6 +95,17 @@ func (c *Checkbox) GetLabel() string {
 	return c.label
 }
 
+// SetMessage sets the text to be displayed after the checkbox
+func (c *Checkbox) SetMessage(message string) *Checkbox {
+	c.message = message
+	return c
+}
+
+// GetMessage returns the text to be displayed after the checkbox
+func (c *Checkbox) GetMessage() string {
+	return c.message
+}
+
 // SetLabelWidth sets the screen width of the label. A value of 0 will cause the
 // primitive to use the width of the label string.
 func (c *Checkbox) SetLabelWidth(width int) *Checkbox {
@@ -136,7 +150,12 @@ func (c *Checkbox) SetFormAttributes(labelWidth int, labelColor, bgColor, fieldT
 
 // GetFieldWidth returns this primitive's field width.
 func (c *Checkbox) GetFieldWidth() int {
-	return 1
+	width := stringWidth(c.checkedString)
+	if c.message != "" {
+		width += 1
+		width += stringWidth(c.message)
+	}
+	return width
 }
 
 // GetFieldHeight returns this primitive's field height.
@@ -229,6 +248,10 @@ func (c *Checkbox) Draw(screen tcell.Screen) {
 		checkedString = strings.Repeat(" ", checkboxWidth)
 	}
 	printWithStyle(screen, checkedString, x, y, 0, checkboxWidth, AlignLeft, fieldStyle, false)
+
+	if c.message != "" {
+		Print(screen, c.message, x+checkboxWidth+1, y, len(c.message), AlignLeft, c.labelColor)
+	}
 }
 
 // InputHandler returns the handler for this primitive.

demos/checkbox/main.go

@@ -5,7 +5,7 @@ import "github.com/rivo/tview"
 
 func main() {
 	app := tview.NewApplication()
-	checkbox := tview.NewCheckbox().SetLabel("Hit Enter to check box: ")
+	checkbox := tview.NewCheckbox().SetLabel("Hit Enter to check box: ").SetMessage("start race")
 	if err := app.SetRoot(checkbox, true).EnableMouse(true).Run(); err != nil {
 		panic(err)
 	}