add border layout config

Signed-off-by: Hadi <[email protected]>

drawer/render.go

@@ -43,11 +43,7 @@ func (m Model) renderOne(d Drawer, background string, w, h int) string {
 		x = max(w-bw, 0)
 	}
 
-	compositor := lipgloss.NewCompositor(
+	return style.Overlay(dim(background, s.DimColor), box, x, 0)
-		lipgloss.NewLayer(dim(background, s.DimColor)),
-		lipgloss.NewLayer(box).X(x).Y(0).Z(1),
-	)
-	return compositor.Render()
 }
 
 func dim(s string, c color.Color) string {

modal/render.go

@@ -42,11 +42,7 @@ func (m Model) renderOne(mo Modal, background string, w, h int) string {
 	bw, bh := lipgloss.Width(box), lipgloss.Height(box)
 	x, y := max((w-bw)/2, 0), max((h-bh)/2, 0)
 
-	compositor := lipgloss.NewCompositor(
+	return style.Overlay(dim(background, s.DimColor), box, x, y)
-		lipgloss.NewLayer(dim(background, s.DimColor)),
-		lipgloss.NewLayer(box).X(x).Y(y).Z(1),
-	)
-	return compositor.Render()
 }
 
 func dim(s string, c color.Color) string {

notification/render.go

@@ -24,11 +24,7 @@ func (m Model) Render(background string) string {
 	sw, sh := lipgloss.Width(stack), lipgloss.Height(stack)
 	x, y := placement(m.position, w, h, sw, sh)
 
-	compositor := lipgloss.NewCompositor(
+	return style.Overlay(background, stack, x, y)
-		lipgloss.NewLayer(background),
-		lipgloss.NewLayer(stack).X(x).Y(y).Z(1),
-	)
-	return compositor.Render()
 }
 
 func (m Model) View(width, height int) string {

style/border.go

@@ -23,6 +23,25 @@ func resolveBorderType(name string) lipgloss.Border {
 	return lipgloss.RoundedBorder()
 }
 
+type LayoutBorderMode string
+
+const (
+	LayoutBorderFull      LayoutBorderMode = "full"
+	LayoutBorderSidebar   LayoutBorderMode = "sidebar"
+	LayoutBorderSeparator LayoutBorderMode = "separator"
+)
+
+func resolveLayoutBorder(name string) LayoutBorderMode {
+	switch strings.ToLower(strings.TrimSpace(name)) {
+	case string(LayoutBorderSidebar):
+		return LayoutBorderSidebar
+	case string(LayoutBorderSeparator):
+		return LayoutBorderSeparator
+	default:
+		return LayoutBorderFull
+	}
+}
+
 func ContentHeight(totalH int) int {
 	h := totalH - 2
 	if h < 0 {
@@ -62,3 +81,37 @@ func RenderWithTitle(border lipgloss.Style, title, content string, width, height
 
 	return lipgloss.JoinVertical(lipgloss.Left, topLine, box)
 }
+
+func RenderPlain(border lipgloss.Style, title, content string, width, height int) string {
+	if titleW := lipgloss.Width(title); titleW > width {
+		title = ansi.Truncate(title, width, "")
+	}
+	titleLine := lipgloss.NewStyle().
+		Bold(true).
+		Foreground(border.GetBorderTopForeground()).
+		Width(width).
+		Render(title)
+
+	contentH := max(height-1, 0)
+	lines := strings.Split(content, "\n")
+	if len(lines) > contentH {
+		content = strings.Join(lines[:contentH], "\n")
+	}
+	box := lipgloss.NewStyle().Width(width).Height(contentH).Render(content)
+
+	return lipgloss.JoinVertical(lipgloss.Left, titleLine, box)
+}
+
+func VerticalDivider(border lipgloss.Style, height int) string {
+	b, _, _, _, _ := border.GetBorder()
+	ch := b.Left
+	if ch == "" {
+		ch = "│"
+	}
+	line := lipgloss.NewStyle().Foreground(border.GetBorderLeftForeground()).Render(ch)
+	rows := make([]string, max(height, 0))
+	for i := range rows {
+		rows[i] = line
+	}
+	return strings.Join(rows, "\n")
+}

style/config.go

@@ -23,6 +23,7 @@ type configYAML struct {
 	Colors       colorsYAML `yaml:"colors"`
 	NerdFonts    bool       `yaml:"nerd_fonts"`
 	Border       string     `yaml:"border"`
+	LayoutBorder string     `yaml:"layout_border"`
 }
 
 func pickString(base, user string) string {
@@ -38,6 +39,7 @@ func mergeConfig(base, user configYAML) configYAML {
 
 		NerdFonts:    base.NerdFonts || user.NerdFonts,
 		Border:       pickString(base.Border, user.Border),
+		LayoutBorder: pickString(base.LayoutBorder, user.LayoutBorder),
 	}
 }
 

style/default.yaml

@@ -9,6 +9,12 @@ nerd_fonts: false
 # One of: rounded, normal, thick, double, hidden, ascii.
 border: rounded
 
+# How sidebar+content layouts draw their borders. One of:
+#   full: both the sidebar and content panes get a full titled border.
+#   sidebar: only the sidebar gets a full border
+#   separator: neither pane is bordered; a single vertical line divides them.
+layout_border: full
+
 colors:
   base00: "#110F12" # Background
   base01: "#1C1920" # Lighter Background / Status Bars

style/overlay.go

@@ -0,0 +1,26 @@
+package style
+
+import (
+	"strings"
+
+	"github.com/charmbracelet/x/ansi"
+)
+
+func Overlay(base, top string, x, y int) string {
+	baseLines := strings.Split(base, "\n")
+	topLines := strings.Split(top, "\n")
+
+	for i, tl := range topLines {
+		row := y + i
+		if row < 0 || row >= len(baseLines) {
+			continue
+		}
+		bl := baseLines[row]
+		tw := ansi.StringWidth(tl)
+		left := ansi.Cut(bl, 0, x)
+		right := ansi.Cut(bl, x+tw, ansi.StringWidth(bl))
+		baseLines[row] = left + tl + right
+	}
+
+	return strings.Join(baseLines, "\n")
+}

style/style.go

@@ -41,6 +41,7 @@ type Styles struct {
 
 	NerdFonts    bool
 	BorderType   lipgloss.Border
+	LayoutBorder LayoutBorderMode
 
 	Panel        lipgloss.Style
 	PanelFocused lipgloss.Style
@@ -49,7 +50,7 @@ type Styles struct {
 	PagerDotInactive string
 }
 
-func newStyles(c colorsYAML, nerdFonts bool, borderName string) Styles {
+func newStyles(c colorsYAML, nerdFonts bool, borderName, layoutBorderName string) Styles {
 	lc := func(s string) color.Color {
 		s = strings.TrimSpace(s)
 		if s != "" && s[0] != '#' {
@@ -76,6 +77,7 @@ func newStyles(c colorsYAML, nerdFonts bool, borderName string) Styles {
 	b0F := lc(c.Base0F)
 
 	borderType := resolveBorderType(borderName)
+	layoutBorder := resolveLayoutBorder(layoutBorderName)
 
 	return Styles{
 		Base00: b00, Base01: b01, Base02: b02, Base03: b03,
@@ -99,6 +101,7 @@ func newStyles(c colorsYAML, nerdFonts bool, borderName string) Styles {
 
 		NerdFonts:    nerdFonts,
 		BorderType:   borderType,
+		LayoutBorder: layoutBorder,
 
 		Panel: lipgloss.NewStyle().
 			Border(borderType).

style/theme.go

@@ -72,7 +72,7 @@ func stylesFromBytes(data []byte) (Styles, error) {
 		return Styles{}, fmt.Errorf("style: parse config: %w", err)
 	}
 	merged := mergeConfig(base, user)
-	return newStyles(merged.Colors, merged.NerdFonts, merged.Border), nil
+	return newStyles(merged.Colors, merged.NerdFonts, merged.Border, merged.LayoutBorder), nil
 }
 
 func configDir() string {