support a few more styling options

F1bonacc1 · May 6, 2024 · f8c25b9 · f8c25b9
1 parent 5a7b83e
commit f8c25b9
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 5 deletions.
diff --git a/src/command/command_wrapper.go b/src/command/command_wrapper.go
@@ -38,7 +38,7 @@ func (c *CmdWrapper) StderrPipe() (io.ReadCloser, error) {
 	return c.cmd.StderrPipe()
 }
 
-func (c *CmdWrapper) AttachIo() () {
+func (c *CmdWrapper) AttachIo() {
 	c.cmd.Stdin = os.Stdin
 	c.cmd.Stdout = os.Stdout
 	c.cmd.Stderr = os.Stderr

diff --git a/src/config/styles.go b/src/config/styles.go
@@ -72,6 +72,8 @@ type (
 	Dialog struct {
 		FgColor            Color `yaml:"fgColor"`
 		BgColor            Color `yaml:"bgColor"`
+		ContrastBgColor    Color `yaml:"contrastBgColor"`
+		AttentionBgColor   Color `yaml:"attentionBgColor"`
 		ButtonFgColor      Color `yaml:"buttonFgColor"`
 		ButtonBgColor      Color `yaml:"buttonBgColor"`
 		ButtonFocusFgColor Color `yaml:"buttonFocusFgColor"`
@@ -182,6 +184,16 @@ func (s *Styles) BgColor() tcell.Color {
 	return s.Body().BgColor.Color()
 }
 
+// ContrastBgColor returns the Contrast background color.
+func (s *Styles) ContrastBgColor() tcell.Color {
+	return s.Dialog().ContrastBgColor.Color()
+}
+
+// AttentionBgColor returns the Contrast background color.
+func (s *Styles) AttentionBgColor() tcell.Color {
+	return s.Dialog().AttentionBgColor.Color()
+}
+
 // BorderColor returns the border color.
 func (s *Styles) BorderColor() tcell.Color {
 	return s.Body().BorderColor.Color()
@@ -215,8 +227,8 @@ func (s *Styles) Dialog() Dialog {
 // Update apply terminal colors based on styles.
 func (s *Styles) Update() {
 	tview.Styles.PrimitiveBackgroundColor = s.BgColor()
-	//tview.Styles.ContrastBackgroundColor = s.BgColor()
-	tview.Styles.MoreContrastBackgroundColor = s.BgColor()
+	tview.Styles.ContrastBackgroundColor = s.ContrastBgColor()
+	tview.Styles.MoreContrastBackgroundColor = s.AttentionBgColor()
 	tview.Styles.PrimaryTextColor = s.FgColor()
 	tview.Styles.BorderColor = s.BorderColor()
 	tview.Styles.TitleColor = s.FgColor()

diff --git a/src/config/themes/cobalt-theme.yaml b/src/config/themes/cobalt-theme.yaml
@@ -25,6 +25,8 @@ style:
   dialog:
     fgColor: cadetblue
     bgColor: black
+    contrastBgColor: blue
+    attentionBgColor: red
     buttonFgColor: black
     buttonBgColor: lightskyblue
     buttonFocusFgColor: black

diff --git a/src/config/themes/default-theme.yaml b/src/config/themes/default-theme.yaml
@@ -25,6 +25,8 @@ style:
   dialog:
     fgColor: cadetblue
     bgColor: black
+    contrastBgColor: blue
+    attentionBgColor: red
     buttonFgColor: black
     buttonBgColor: lightskyblue
     buttonFocusFgColor: black

diff --git a/src/config/themes/light-theme.yaml b/src/config/themes/light-theme.yaml
@@ -27,6 +27,8 @@ style:
   dialog:
     fgColor: cadetblue
     bgColor: "#3B3B3B"
+    contrastBgColor: blue
+    attentionBgColor: red
     buttonFgColor: "#3B3B3B"
     buttonBgColor: lightskyblue
     buttonFocusFgColor: "#3B3B3B"

diff --git a/src/config/themes/monokai-theme.yaml b/src/config/themes/monokai-theme.yaml
@@ -25,6 +25,8 @@ style:
   dialog:
     fgColor: cadetblue
     bgColor: black
+    contrastBgColor: blue
+    attentionBgColor: red
     buttonFgColor: black
     buttonBgColor: dodgerblue
     buttonFocusFgColor: black

diff --git a/src/config/themes/onedark-theme.yaml b/src/config/themes/onedark-theme.yaml
@@ -25,6 +25,8 @@ style:
   dialog:
     fgColor: cadetblue
     bgColor: black
+    contrastBgColor: blue
+    attentionBgColor: red
     buttonFgColor: black
     buttonBgColor: '#61AFEF'
     buttonFocusFgColor: black

diff --git a/src/tui/view.go b/src/tui/view.go
@@ -337,8 +337,8 @@ func (pv *pcView) attentionMessage(message string) {
 		SetSelectable(false).
 		SetAlign(tview.AlignCenter).
 		SetExpansion(0).
-		SetTextColor(tcell.ColorWhite).
-		SetBackgroundColor(tcell.ColorRed))
+		SetTextColor(tview.Styles.ContrastSecondaryTextColor).
+		SetBackgroundColor(tview.Styles.MoreContrastBackgroundColor))
 }
 
 func (pv *pcView) hideAttentionMessage() {