From 257affcd4841b8f595a4a13cdb0fd2a1a2dd0faa Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sun, 13 Jan 2019 15:27:56 -0500
Subject: Revert "Add abstract list, update dirlist accordingly"

This reverts commit 3157897c1a20e5638feaf56e753b7886bc4ba267.
---
 lib/ui/grid.go |   1 -
 lib/ui/list.go | 110 ---------------------------------------------------------
 2 files changed, 111 deletions(-)
 delete mode 100644 lib/ui/list.go

(limited to 'lib/ui')

diff --git a/lib/ui/grid.go b/lib/ui/grid.go
index 5fe6ab2..3c375ee 100644
--- a/lib/ui/grid.go
+++ b/lib/ui/grid.go
@@ -5,7 +5,6 @@ import (
 	"math"
 )
 
-// A container which arranges its children on a grid.
 type Grid struct {
 	rows         []GridSpec
 	rowLayout    []gridLayout
diff --git a/lib/ui/list.go b/lib/ui/list.go
deleted file mode 100644
index 58f304f..0000000
--- a/lib/ui/list.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package ui
-
-import (
-	"fmt"
-)
-
-// A container which arranges its children in a list.
-type List struct {
-	Items        []*ListItem
-	itemHeight   int
-	onInvalidate func(d Drawable)
-	selected     int
-}
-
-type ListItem struct {
-	Content Drawable
-	invalid bool
-}
-
-type SelectableDrawable interface {
-	Drawable
-	DrawWithSelected(ctx *Context, selected bool)
-}
-
-func NewList() *List {
-	return &List{itemHeight: 1, selected: -1}
-}
-
-func (list *List) OnInvalidate(onInvalidate func(d Drawable)) {
-	list.onInvalidate = onInvalidate
-}
-
-func (list *List) Invalidate() {
-	for _, item := range list.Items {
-		item.Content.Invalidate()
-	}
-	if list.onInvalidate != nil {
-		list.onInvalidate(list)
-	}
-}
-
-func (list *List) Draw(ctx *Context) {
-	for i, item := range list.Items {
-		if !item.invalid {
-			continue
-		}
-		subctx := ctx.Subcontext(0, i, ctx.Width(), list.itemHeight)
-		if content, ok := item.Content.(SelectableDrawable); ok {
-			content.DrawWithSelected(subctx, i == list.selected)
-		} else {
-			item.Content.Draw(subctx)
-		}
-	}
-}
-
-func (list *List) Add(child Drawable) {
-	list.Items = append(list.Items, &ListItem{Content: child, invalid: true})
-	child.OnInvalidate(list.childInvalidated)
-	list.Invalidate()
-}
-
-func (list *List) Remove(child Drawable) {
-	for i, item := range list.Items {
-		if item.Content == child {
-			list.Items = append(list.Items[:i], list.Items[i+1:]...)
-			child.OnInvalidate(nil)
-			list.Invalidate()
-			return
-		}
-	}
-	panic(fmt.Errorf("Attempted to remove unknown child"))
-}
-
-func (list *List) Set(items []Drawable) {
-	for _, item := range list.Items {
-		item.Content.OnInvalidate(nil)
-	}
-	list.Items = make([]*ListItem, len(items))
-	for i, item := range items {
-		list.Items[i] = &ListItem{Content: item, invalid: true}
-		item.OnInvalidate(list.childInvalidated)
-	}
-	list.Invalidate()
-}
-
-func (list *List) Select(index int) {
-	if index >= len(list.Items) || index < 0 {
-		panic(fmt.Errorf("Attempted to select unknown child"))
-	}
-	list.selected = index
-	list.Invalidate()
-}
-
-func (list *List) ItemHeight(height int) {
-	list.itemHeight = height
-	list.Invalidate()
-}
-
-func (list *List) childInvalidated(child Drawable) {
-	for _, item := range list.Items {
-		if item.Content == child {
-			item.invalid = true
-			if list.onInvalidate != nil {
-				list.onInvalidate(list)
-			}
-			return
-		}
-	}
-	panic(fmt.Errorf("Attempted to invalidate unknown child"))
-}
-- 
cgit v1.2.3