From 252433f13d7cf38eb314e79fec00018007336395 Mon Sep 17 00:00:00 2001
From: Sasha Koshka <sashakoshka@tebibyte.media>
Date: Sat, 4 Mar 2023 01:26:23 -0500
Subject: [PATCH] Cleaned up Container somewhat

---
 elements/basic/container.go | 75 +++++++++----------------------------
 1 file changed, 18 insertions(+), 57 deletions(-)

diff --git a/elements/basic/container.go b/elements/basic/container.go
index 37601a4..eeeebfd 100644
--- a/elements/basic/container.go
+++ b/elements/basic/container.go
@@ -203,17 +203,6 @@ func (element *Container) ChildAt (point image.Point) (child elements.Element) {
 	return
 }
 
-func (element *Container) childPosition (child elements.Element) (position image.Point) {
-	for _, entry := range element.children {
-		if entry.Element == child {
-			position = entry.Bounds.Min
-			break
-		}
-	}
-
-	return
-}
-
 func (element *Container) redoAll () {
 	if !element.core.HasImage() { return }
 	// do a layout
@@ -236,7 +225,6 @@ func (element *Container) redoAll () {
 	}
 }
 
-
 // SetTheme sets the element's theme.
 func (element *Container) SetTheme (new theme.Theme) {
 	if new == element.theme.Theme { return }
@@ -279,24 +267,6 @@ func (element *Container) OnFocusMotionRequest (
 	element.Propagator.OnFocusMotionRequest(callback)
 }
 
-func (element *Container) forFocused (callback func (child elements.Focusable) bool) {
-	for _, entry := range element.children {
-		child, focusable := entry.Element.(elements.Focusable)
-		if focusable && child.Focused() {
-			if !callback(child) { break }
-		}
-	}
-}
-
-func (element *Container) forFocusable (callback func (child elements.Focusable) bool) {
-	for _, entry := range element.children {
-		child, focusable := entry.Element.(elements.Focusable)
-		if focusable {
-			if !callback(child) { break }
-		}
-	}
-}
-
 func (element *Container) forFlexible (callback func (child elements.Flexible) bool) {
 	for _, entry := range element.children {
 		child, flexible := entry.Element.(elements.Flexible)
@@ -306,31 +276,16 @@ func (element *Container) forFlexible (callback func (child elements.Flexible) b
 	}
 }
 
-func (element *Container) forFocusableBackward (callback func (child elements.Focusable) bool) {
-	for index := len(element.children) - 1; index >= 0; index -- {
-		child, focusable := element.children[index].Element.(elements.Focusable)
-		if focusable {
-			if !callback(child) { break }
-		}
-	}
-}
-
-func (element *Container) firstFocused () (index int) {
-	for currentIndex, entry := range element.children {
-		child, focusable := entry.Element.(elements.Focusable)
-		if focusable && child.Focused() {
-			return currentIndex
-		}
-	}
-	return -1
-}
-
 func (element *Container) reflectChildProperties () {
 	element.focusable = false
-	element.forFocusable (func (elements.Focusable) bool {
-		element.focusable = true
-		return false
-	})
+	for _, entry := range element.children {
+		_, focusable := entry.Element.(elements.Focusable)
+		if focusable {
+			element.focusable = true
+			break
+		}
+	}
+	
 	element.flexible = false
 	element.forFlexible (func (elements.Flexible) bool {
 		element.flexible = true
@@ -348,16 +303,22 @@ func (element *Container) childFocusRequestCallback (
 ) {
 	if element.onFocusRequest != nil && element.onFocusRequest() {
 		element.focused = true
-		element.forFocused (func (child elements.Focusable) bool {
-			child.HandleUnfocus()
-			return true
-		})
+		element.unfocusAllChildren()
 		return true
 	} else {
 		return false
 	}
 }
 
+func (element *Container) unfocusAllChildren() {
+	for _, entry := range element.children {
+		child, focusable := entry.Element.(elements.Focusable)
+		if focusable && child.Focused() {
+			child.HandleUnfocus()
+		}
+	}
+}
+
 func (element *Container) updateMinimumSize () {
 	margin  := element.theme.Margin(theme.PatternBackground)
 	padding := element.theme.Padding(theme.PatternBackground)