src/Builder4/Editor.bjs

src/Builder4/Editor.vala

diff --git a/src/Builder4/Editor.bjs b/src/Builder4/Editor.bjs
index 6be9576..bcdf91a 100644 (file)
--- a/src/Builder4/Editor.bjs
+++ b/src/Builder4/Editor.bjs
@@ -1017,31 +1017,33 @@
            "id" : "navigationselmodel",
            "items" : [
             {
-             "$ Gtk.TreeListModelCreateModelFunc create_func" : [
-              "(item) => {",
-              " ",
-              "\treturn ((Lsp.DocumentSymbol)item).children;",
-              "}",
-              ""
-             ],
              "$ xns" : "Gtk",
              "* prop" : "model",
-             "bool autoexpand" : true,
-             "bool passthrough" : false,
              "items" : [
               {
-               "$ GLib.Type item_type" : "typeof(Lsp.DocumentSymbol)",
-               "$ xns" : "GLib",
-               "* prop" : "root",
-               "id" : "navliststore",
-               "xtype" : "ListStore"
+               "$ Gtk.TreeListModelCreateModelFunc create_func" : [
+                "(item) => {",
+                " ",
+                "\treturn ((Lsp.DocumentSymbol)item).children;",
+                "}",
+                ""
+               ],
+               "$ xns" : "Gtk",
+               "* prop" : "model",
+               "bool autoexpand" : true,
+               "bool passthrough" : false,
+               "items" : [
+                {
+                 "$ GLib.Type item_type" : "typeof(Lsp.DocumentSymbol)",
+                 "$ xns" : "GLib",
+                 "* prop" : "root",
+                 "id" : "navliststore",
+                 "xtype" : "ListStore"
+                }
+               ],
+               "xtype" : "TreeListModel"
               }
              ],
-             "xtype" : "TreeListModel"
-            },
-            {
-             "$ xns" : "Gtk",
-             "* prop" : "model",
              "xtype" : "SortListModel"
             }
            ],

diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala
index 0f8bc7b..85abc84 100644 (file)
--- a/src/Builder4/Editor.vala
+++ b/src/Builder4/Editor.vala
@@ -1961,7 +1961,7 @@ public class Editor : Object
                {
                        _this = _owner;
                        _this.navigationselmodel = this;
-                       var child_1 = new Xcls_TreeListModel32( _this );
+                       var child_1 = new Xcls_SortListModel60( _this );
                        child_1.ref();
                        this.el = new Gtk.NoSelection( child_1.el );
 
@@ -1983,24 +1983,21 @@ public class Editor : Object
                         
                }
        }
-       public class Xcls_TreeListModel32 : Object
+       public class Xcls_SortListModel60 : Object
        {
-               public Gtk.TreeListModel el;
+               public Gtk.SortListModel el;
                private Editor  _this;
 
 
                        // my vars (def)
 
                // ctor
-               public Xcls_TreeListModel32(Editor _owner )
+               public Xcls_SortListModel60(Editor _owner )
                {
                        _this = _owner;
-                       new Xcls_navliststore( _this );
-                       this.el = new Gtk.TreeListModel( _this.navliststore.el, false, true, (item) => {
- 
-       return ((Lsp.DocumentSymbol)item).children;
-}
- );
+                       var child_1 = new Xcls_TreeListModel171( _this );
+                       child_1.ref();
+                       this.el = new Gtk.SortListModel( child_1.el, null );
 
                        // my vars (dec)
 
@@ -2009,20 +2006,24 @@ public class Editor : Object
 
                // user defined functions
        }
-       public class Xcls_navliststore : Object
+       public class Xcls_TreeListModel171 : Object
        {
-               public GLib.ListStore el;
+               public Gtk.TreeListModel el;
                private Editor  _this;
 
 
                        // my vars (def)
 
                // ctor
-               public Xcls_navliststore(Editor _owner )
+               public Xcls_TreeListModel171(Editor _owner )
                {
                        _this = _owner;
-                       _this.navliststore = this;
-                       this.el = new GLib.ListStore( typeof(Lsp.DocumentSymbol) );
+                       new Xcls_navliststore( _this );
+                       this.el = new Gtk.TreeListModel( _this.navliststore.el, false, true, (item) => {
+ 
+       return ((Lsp.DocumentSymbol)item).children;
+}
+ );
 
                        // my vars (dec)
 
@@ -2031,21 +2032,20 @@ public class Editor : Object
 
                // user defined functions
        }
-
-
-       public class Xcls_SortListModel60 : Object
+       public class Xcls_navliststore : Object
        {
-               public Gtk.SortListModel el;
+               public GLib.ListStore el;
                private Editor  _this;
 
 
                        // my vars (def)
 
                // ctor
-               public Xcls_SortListModel60(Editor _owner )
+               public Xcls_navliststore(Editor _owner )
                {
                        _this = _owner;
-                       this.el = new Gtk.SortListModel( null, null );
+                       _this.navliststore = this;
+                       this.el = new GLib.ListStore( typeof(Lsp.DocumentSymbol) );
 
                        // my vars (dec)
 
@@ -2056,6 +2056,8 @@ public class Editor : Object
        }
 
 
+
+
        public class Xcls_GestureClick34 : Object
        {
                public Gtk.GestureClick el;