From ed4fecbf47e3ea29e70feecba13584620fc182d9 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Sat, 23 Mar 2024 16:05:21 +0800
Subject: [PATCH] src/Builder4/Editor.bjs src/Builder4/Editor.vala

---
 src/Builder4/Editor.bjs  | 27 +++++++++++++++------------
 src/Builder4/Editor.vala | 27 +++++++++++++++------------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/Builder4/Editor.bjs b/src/Builder4/Editor.bjs
index 898d604be..03726f592 100644
--- a/src/Builder4/Editor.bjs
+++ b/src/Builder4/Editor.bjs
@@ -1072,7 +1072,7 @@
                  ],
                  "$ xns" : "Gtk",
                  "* prop" : "model",
-                 "bool autoexpand" : false,
+                 "bool autoexpand" : true,
                  "bool passthrough" : false,
                  "items" : [
                   {
@@ -1173,18 +1173,21 @@
                ],
                "| void collapseOnLoad" : [
                 "() {",
-                "",
-                "return;",
-                "\tvar sym = (Lsp.DocumentSymbol)  row.get_item();",
-                "\t",
-                "\tswitch (sym.kind) {",
-                " \t\tcase Lsp.SymbolKind.Enum: ",
-                " \t\t//\trow.expanded = false;",
-                " \t\t\tbreak;",
-                "\t\tdefault:",
-                "\t\t\trow.expanded = true;",
-                "\t\t\tbreak;",
+                "\tfor (var i=0;i < this.el.get_n_items(); i++) {",
+                "\t\tvar tr = (Gtk.TreeListRow)this.el.get_item(i);",
+                "\t   ",
+                "\t\tvar sym =  (Lsp.DocumentSymbol)tr.get_item();",
+                "\t\tswitch (sym.kind) {",
+                "\t \t\tcase Lsp.SymbolKind.Enum: ",
+                "\t \t\t\ttr.expanded = false;",
+                "\t \t\t\tbreak;",
+                "\t\t\tdefault:",
+                "\t\t\t\t//tr.expanded = true;",
+                "\t\t\t\tbreak;",
+                "\t\t}",
                 "\t}",
+                " ",
+                "\t",
                 "",
                 "",
                 "}"
diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala
index 54f25b5dc..3a6dade3d 100644
--- a/src/Builder4/Editor.vala
+++ b/src/Builder4/Editor.vala
@@ -2184,18 +2184,21 @@ public class Editor : Object
 
 		// user defined functions
 		public void collapseOnLoad () {
-		
-		return;
-			var sym = (Lsp.DocumentSymbol)  row.get_item();
-			
-			switch (sym.kind) {
-		 		case Lsp.SymbolKind.Enum: 
-		 		//	row.expanded = false;
-		 			break;
-				default:
-					row.expanded = true;
-					break;
+			for (var i=0;i < this.el.get_n_items(); i++) {
+				var tr = (Gtk.TreeListRow)this.el.get_item(i);
+			   
+				var sym =  (Lsp.DocumentSymbol)tr.get_item();
+				switch (sym.kind) {
+			 		case Lsp.SymbolKind.Enum: 
+			 			tr.expanded = false;
+			 			break;
+					default:
+						//tr.expanded = true;
+						break;
+				}
 			}
+		 
+			
 		
 		
 		}
@@ -2235,7 +2238,7 @@ public class Editor : Object
 		{
 			_this = _owner;
 			new Xcls_navliststore( _this );
-			this.el = new Gtk.TreeListModel( _this.navliststore.el, false, false, (item) => {
+			this.el = new Gtk.TreeListModel( _this.navliststore.el, false, true, (item) => {
  
 	return ((Lsp.DocumentSymbol)item).children;
 }
-- 
2.39.2