chore: use borders style from ctx

prgres · May 17, 2024 · 3534f56 · 3534f56
1 parent cc1cbf0
commit 3534f56
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 35 deletions.
diff --git a/ui/components/views-tabs/viewstabs.go b/ui/components/views-tabs/viewstabs.go
@@ -136,13 +136,11 @@ func (m Model) View() string {
  borderMargin = 2
  }
 
+ styleBorders := m.ctx.Style.Borders.Copy().
+ BorderForeground(bColor)
+
  style := lipgloss.NewStyle().
- BorderStyle(lipgloss.RoundedBorder()).
- BorderForeground(bColor).
- BorderBottom(m.ifBorders).
- BorderRight(m.ifBorders).
- BorderTop(m.ifBorders).
- BorderLeft(m.ifBorders).
+ Inherit(styleBorders).
  Height(1).
  MaxHeight(1 + borderMargin).
  Width(m.size.Width - borderMargin).

diff --git a/ui/views/tasks/tasks.go b/ui/views/tasks/tasks.go
@@ -290,12 +290,10 @@ func (m Model) View() string {
  )
  }
 
+ styleBorders := m.ctx.Style.Borders.Copy()
+
  return lipgloss.NewStyle().
- BorderStyle(lipgloss.RoundedBorder()).
- BorderRight(m.ifBorders).
- BorderBottom(m.ifBorders).
- BorderTop(m.ifBorders).
- BorderLeft(m.ifBorders).
+ Inherit(styleBorders).
  Render(lipgloss.JoinVertical(
  lipgloss.Top,
  widgetViewsTabsRendered,

diff --git a/ui/widgets/navigator/widget.go b/ui/widgets/navigator/widget.go
@@ -323,13 +323,11 @@ func (m Model) View() string {
  borderMargin = 2
  }
 
+ styleBorders := m.ctx.Style.Borders.Copy().
+ BorderForeground(bColor)
+
  style := lipgloss.NewStyle().
- BorderStyle(lipgloss.RoundedBorder()).
- BorderForeground(bColor).
- BorderBottom(m.ifBorders).
- BorderRight(m.ifBorders).
- BorderTop(m.ifBorders).
- BorderLeft(m.ifBorders).
+ Inherit(styleBorders).
  Width(m.size.Width - borderMargin).
  MaxWidth(m.size.Width + borderMargin).
  Height(m.size.Height - borderMargin).

diff --git a/ui/widgets/tasks-sidebar/tasksidebar.go b/ui/widgets/tasks-sidebar/tasksidebar.go
@@ -171,13 +171,11 @@ func (m Model) View() string {
  bColor = m.ctx.Theme.BordersColorActive
  }
 
+ styleBorders := m.ctx.Style.Borders.Copy().
+ BorderForeground(bColor)
+
  return lipgloss.NewStyle().
- BorderStyle(lipgloss.RoundedBorder()).
- BorderForeground(bColor).
- BorderRight(m.ifBorders).
- BorderBottom(m.ifBorders).
- BorderTop(m.ifBorders).
- BorderLeft(m.ifBorders).
+ Inherit(styleBorders).
  Render(
  m.viewport.View(),
  )

diff --git a/ui/widgets/tasks-table/taskstable.go b/ui/widgets/tasks-table/taskstable.go
@@ -248,13 +248,11 @@ func (m Model) View() string {
  bColor = m.ctx.Theme.BordersColorActive
  }
 
+ styleBorders := m.ctx.Style.Borders.Copy().
+ BorderForeground(bColor)
+
  return lipgloss.NewStyle().
- BorderStyle(lipgloss.RoundedBorder()).
- BorderForeground(bColor).
- BorderBottom(m.ifBorders).
- BorderRight(m.ifBorders).
- BorderTop(m.ifBorders).
- BorderLeft(m.ifBorders).
+ Inherit(styleBorders).
  Render(
  m.table.View(),
  )

diff --git a/ui/widgets/tasks-tabs/taskstabs.go b/ui/widgets/tasks-tabs/taskstabs.go
@@ -131,13 +131,11 @@ func (m Model) View() string {
  bColor = m.ctx.Theme.BordersColorActive
  }
 
+ styleBorders := m.ctx.Style.Borders.Copy().
+ BorderForeground(bColor)
+
  return lipgloss.NewStyle().
- BorderStyle(lipgloss.RoundedBorder()).
- BorderForeground(bColor).
- BorderRight(true).
- BorderBottom(true).
- BorderTop(true).
- BorderLeft(true).
+ Inherit(styleBorders).
  Render(
  s.String(),
  )