taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'jeangovil-todo-fix'

Browse Source
This commit is contained in:
Chris Cummer 2018-05-30 10:33:35 -07:00
commit 1d23d5369f
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
todo/display.go
View File

@ -15,15 +15,14 @@ func (widget *Widget) display() {
str := "" str := ""
checked := []*Item{} checked := []*Item{}
uncheckedLen := 0 var selectedItem *Item
var selected *Item
var newList List var newList List
for idx, item := range widget.list.Items { for idx, item := range widget.list.Items {
foreColor, backColor := "white", "black" foreColor, backColor := "white", "black"
// save the selected one // save the selected one
if idx == widget.list.selected { if idx == widget.list.selected {
selected = item selectedItem = item
} }
if item.Checked { if item.Checked {
@ -31,11 +30,7 @@ func (widget *Widget) display() {
continue continue
} }
uncheckedLen++ if widget.View.HasFocus() && item == selectedItem {
if widget.View.HasFocus() && item == selected {
// set selected item index
newList.selected = idx
foreColor = Config.UString("wtf.mods.todo.colors.highlight.fore", "black") foreColor = Config.UString("wtf.mods.todo.colors.highlight.fore", "black")
backColor = Config.UString("wtf.mods.todo.colors.highlight.back", "white") backColor = Config.UString("wtf.mods.todo.colors.highlight.back", "white")
} }
@ -52,11 +47,10 @@ func (widget *Widget) display() {
newList.Items = append(newList.Items, item) newList.Items = append(newList.Items, item)
} }
for idx, item := range checked { for _, item := range checked {
foreColor, backColor := Config.UString("wtf.mods.todo.colors.checked", "white"), "black" foreColor, backColor := Config.UString("wtf.mods.todo.colors.checked", "white"), "black"
if widget.View.HasFocus() && item == selected { if widget.View.HasFocus() && item == selectedItem {
newList.selected = idx + uncheckedLen
foreColor = Config.UString("wtf.mods.todo.colors.highlight.fore", "black") foreColor = Config.UString("wtf.mods.todo.colors.highlight.fore", "black")
backColor = Config.UString("wtf.mods.todo.colors.highlight.back", "white") backColor = Config.UString("wtf.mods.todo.colors.highlight.back", "white")
} }
@ -73,6 +67,13 @@ func (widget *Widget) display() {
newList.Items = append(newList.Items, item) newList.Items = append(newList.Items, item)
} }
// update selected index with new index of selected item
for idx, item := range newList.Items {
if item == selectedItem {
newList.selected = idx
}
}
// update list with new Items and selected item index // update list with new Items and selected item index
widget.list = &newList widget.list = &newList