Merge pull request #1067 from cogentcore/icon-chooser

exclude icons from list (was already in table) and use consistent expression to exclude
cogentcore · Jul 26, 2024 · 06c5847 · 06c5847
2 parents 0b40eb1 + 1b0a083
commit 06c5847
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/list.go b/core/list.go
@@ -486,7 +486,7 @@ func (lb *ListBase) BindSelect(val *int) *ListBase {
 func (lb *ListBase) UpdateMaxWidths() {
 	lb.maxWidth = 0
 	npv := reflectx.NonPointerValue(lb.elementValue)
-	isString := npv.Type().Kind() == reflect.String
+	isString := npv.Type().Kind() == reflect.String && npv.Type() != reflect.TypeFor[icons.Icon]()
 	if !isString || lb.SliceSize == 0 {
 		return
 	}

diff --git a/core/table.go b/core/table.go
@@ -197,9 +197,8 @@ func (tb *Table) UpdateMaxWidths() {
 		tb.colMaxWidths[fli] = 0
 		val := tb.sliceElementValue(0)
 		fval := val.FieldByIndex(field.Index)
-		_, isicon := fval.Interface().(icons.Icon)
-		isString := fval.Type().Kind() == reflect.String
-		if !isString || isicon {
+		isString := fval.Type().Kind() == reflect.String && fval.Type() != reflect.TypeFor[icons.Icon]()
+		if !isString {
 			continue
 		}
 		mxw := 0