mirror of
https://github.com/taigrr/wtf
synced 2025-01-18 04:03:14 -08:00
WTF-730 Fix missing color key config error (#738)
* WTF-730 Fix missing color key config error Signed-off-by: Chris Cummer <chriscummer@me.com> * WTF-730 Add Subheading color formatting to modules Users can now set a `subheading` color in their config to change the color of subheadings in widget display. Defaults to `red`. Signed-off-by: Chris Cummer <chriscummer@me.com> * WTF-730 Fix oustanding color issues Clean up missing color config changes not addressed in earlier commits. Signed-off-by: Chris Cummer <chriscummer@me.com> * Remove unused dependency Signed-off-by: Chris Cummer <chriscummer@me.com> * WTF-730 Base cleanup Signed-off-by: Chris Cummer <chriscummer@me.com> * WTF-730 Fix a few bugs related to color config changes Signed-off-by: Chris Cummer <chriscummer@me.com> * WTF-730 Fix issues with PagerDuty subheading display Signed-off-by: Chris Cummer <chriscummer@me.com> * WTF-730 Fix bug with Todo list colour rendering Signed-off-by: Chris Cummer <chriscummer@me.com>
This commit is contained in:
@@ -41,25 +41,23 @@ func (widget *Widget) content() (string, string, bool) {
|
||||
return widget.CommonSettings().Title, str, false
|
||||
}
|
||||
|
||||
func (widget *Widget) formattedItemLine(idx int, item *checklist.ChecklistItem, selectedItem *checklist.ChecklistItem, maxLen int) string {
|
||||
foreColor, backColor := widget.settings.common.Colors.Text, widget.settings.common.Colors.Background
|
||||
func (widget *Widget) formattedItemLine(idx int, currItem *checklist.ChecklistItem, selectedItem *checklist.ChecklistItem, maxLen int) string {
|
||||
rowColor := widget.RowColor(idx)
|
||||
|
||||
if item.Checked {
|
||||
foreColor = widget.settings.common.Colors.Checked
|
||||
if currItem.Checked {
|
||||
rowColor = widget.settings.common.Colors.CheckboxTheme.Checked
|
||||
}
|
||||
|
||||
if widget.View.HasFocus() && (item == selectedItem) {
|
||||
foreColor = widget.settings.common.Colors.HighlightFore
|
||||
backColor = widget.settings.common.Colors.HighlightBack
|
||||
if widget.View.HasFocus() && (currItem == selectedItem) {
|
||||
rowColor = widget.RowColor(idx)
|
||||
}
|
||||
|
||||
row := fmt.Sprintf(
|
||||
` [%s:%s]|%s| %s[white]`,
|
||||
foreColor,
|
||||
backColor,
|
||||
item.CheckMark(),
|
||||
tview.Escape(item.Text),
|
||||
` [%s]|%s| %s[white]`,
|
||||
rowColor,
|
||||
currItem.CheckMark(),
|
||||
tview.Escape(currItem.Text),
|
||||
)
|
||||
|
||||
return utils.HighlightableHelper(widget.View, row, idx, len(item.Text))
|
||||
return utils.HighlightableHelper(widget.View, row, idx, len(currItem.Text))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user