Fix #8032 - speed up add remove of errors from tree

diff --git a/src/Builder4/WindowLeftProps.bjs b/src/Builder4/WindowLeftProps.bjs
index 657d9b1..7df8fe4 100644 (file)
--- a/src/Builder4/WindowLeftProps.bjs
+++ b/src/Builder4/WindowLeftProps.bjs
@@ -3,6 +3,7 @@
  "gen_extended" : false,
  "items" : [
   {
+   "# Gee.ArrayList<Gtk.Widget>? error_widgets" : "null",
    "# JsRender.JsRender file" : "",
    "# JsRender.Node node" : "",
    "# Xcls_MainWindow main_window" : "null",
@@ -1450,31 +1451,12 @@
    ],
    "| void removeErrors" : [
     "() {",
-    "\tvar  child = this.view.el.get_first_child(); ",
-    " ",
-    "\tvar reading_header = true;",
-    " ",
-    "\twhile (child != null) {",
-    "\t\t//GLib.debug(\"Got %s\", child.get_type().name());",
-    "\t   ",
-    "\t   if (reading_header) {",
-    "\t\t\t",
-    "",
-    "\t\t\tif (child.get_type().name() != \"GtkColumnListView\") {",
-    "\t\t\t   ",
-    "\t\t\t\tchild = child.get_next_sibling();",
-    "\t\t\t\tcontinue;",
-    "\t\t\t}",
-    "\t\t\t// should be columnlistview",
-    "\t\t\tchild = child.get_first_child(); ",
-    "\t\t ",
-    "\t\t ",
-    "\t\t\t",
-    "\t\t\treading_header = false;",
-    "\t\t\tcontinue;",
-    "\t    }",
-    "\t    ",
-    "\t  \tif (child.has_css_class(\"node-err\")) {",
+    "\t\tif (this.error_widgets == null || this.error_widgets.size < 1) {",
+    " \t\treturn;",
+    "\t}",
+    "\tforeach(var child in this.error_widgets) {",
+    "\t",
+    "\t\tif (child.has_css_class(\"node-err\")) {",
     "\t\t\tchild.remove_css_class(\"node-err\");",
     "\t\t}",
     "\t\tif (child.has_css_class(\"node-warn\")) {",
@@ -1484,9 +1466,9 @@
     "\t\tif (child.has_css_class(\"node-depr\")) {",
     "\t\t\tchild.remove_css_class(\"node-depr\");",
     "\t\t}",
-    "\t\t",
-    "        child = child.get_next_sibling(); ",
     "\t}",
+    "\tthis.error_widgets  = null;",
+    "\treturn;",
     "\t//GLib.debug(\"Rturning null\");",
     "     ",
     "}"
@@ -1511,7 +1493,7 @@
     "\t\treturn;",
     "\t}",
     "\tthis.removeErrors();",
-    "\t",
+    "\tthis.error_widgets = new Gee.ArrayList<Gtk.Widget>();",
     "\tforeach(var diag in ar) { ",
     "\t",
     "\t\t ",
@@ -1532,10 +1514,13 @@
     "    \tif (w == null) {",
     "    \t\treturn;",
     "\t\t}",
-    "\t  \t\tvar ed = diag.category.down();",
+    "",
+    "\t\t",
+    "  \t\tvar ed = diag.category.down();",
     "\t\tif (ed != \"err\" && w.has_css_class(\"node-err\")) {",
     "\t\t\tcontinue;",
     "\t\t}",
+    "\t\tthis.error_widgets.add(w);\t\t",
     "\t\tif (ed == \"err\" && w.has_css_class(\"node-warn\")) {",
     "\t\t\tw.remove_css_class(\"node-warn\");",
     "\t\t}",

diff --git a/src/Builder4/WindowLeftProps.vala b/src/Builder4/WindowLeftProps.vala
index ceb58d0..16720bc 100644 (file)
--- a/src/Builder4/WindowLeftProps.vala
+++ b/src/Builder4/WindowLeftProps.vala
@@ -33,6 +33,7 @@ public class Xcls_LeftProps : Object
        public JsRender.JsRender file;
        public JsRender.Node node;
        public signal void show_editor (JsRender.JsRender file, JsRender.Node node, JsRender.NodeProp prop);
+       public Gee.ArrayList<Gtk.Widget>? error_widgets;
 
        // ctor
        public Xcls_LeftProps()
@@ -45,6 +46,7 @@ public class Xcls_LeftProps : Object
                this.allow_edit = false;
                this.main_window = null;
                this.last_error_counter = -1;
+               this.error_widgets = null;
 
                // set gobject values
                this.el.homogeneous = false   ;
@@ -105,7 +107,7 @@ public class Xcls_LeftProps : Object
                        return;
                }
                this.removeErrors();
-               
+               this.error_widgets = new Gee.ArrayList<Gtk.Widget>();
                foreach(var diag in ar) { 
                
                         
@@ -126,10 +128,13 @@ public class Xcls_LeftProps : Object
                if (w == null) {
                        return;
                        }
-                               var ed = diag.category.down();
+       
+                       
+                       var ed = diag.category.down();
                        if (ed != "err" && w.has_css_class("node-err")) {
                                continue;
                        }
+                       this.error_widgets.add(w);              
                        if (ed == "err" && w.has_css_class("node-warn")) {
                                w.remove_css_class("node-warn");
                        }
@@ -245,31 +250,12 @@ public class Xcls_LeftProps : Object
                */
        }
        public void removeErrors () {
-               var  child = this.view.el.get_first_child(); 
-        
-               var reading_header = true;
-        
-               while (child != null) {
-                       //GLib.debug("Got %s", child.get_type().name());
-                  
-                  if (reading_header) {
-                               
-       
-                               if (child.get_type().name() != "GtkColumnListView") {
-                                  
-                                       child = child.get_next_sibling();
-                                       continue;
-                               }
-                               // should be columnlistview
-                               child = child.get_first_child(); 
-                        
-                        
-                               
-                               reading_header = false;
-                               continue;
-                   }
-                   
-                       if (child.has_css_class("node-err")) {
+                       if (this.error_widgets == null || this.error_widgets.size < 1) {
+                       return;
+               }
+               foreach(var child in this.error_widgets) {
+               
+                       if (child.has_css_class("node-err")) {
                                child.remove_css_class("node-err");
                        }
                        if (child.has_css_class("node-warn")) {
@@ -279,9 +265,9 @@ public class Xcls_LeftProps : Object
                        if (child.has_css_class("node-depr")) {
                                child.remove_css_class("node-depr");
                        }
-                       
-               child = child.get_next_sibling(); 
                }
+               this.error_widgets  = null;
+               return;
                //GLib.debug("Rturning null");
             
        }
@@ -510,6 +496,7 @@ public class Xcls_LeftProps : Object
 
                        // set gobject values
                        var child_1 = new Xcls_Box7( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
                }
 
@@ -606,6 +593,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label9( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -670,6 +658,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label11( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -737,6 +726,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label13( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -802,6 +792,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label15( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -866,6 +857,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label17( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -953,6 +945,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label20( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -1015,6 +1008,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label22( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -1078,6 +1072,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label24( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -1163,6 +1158,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label27( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -1226,6 +1222,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label29( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -1287,6 +1284,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label31( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -1370,6 +1368,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label34( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -1433,6 +1432,7 @@ public class Xcls_LeftProps : Object
                        // set gobject values
                        this.el.has_frame = false;
                        var child_1 = new Xcls_Label36( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -1497,6 +1497,7 @@ public class Xcls_LeftProps : Object
                        this.el.has_frame = false;
                        this.el.tooltip_markup = "Add a flexy include (for HTML templates)";
                        var child_1 = new Xcls_Label38( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -1824,6 +1825,7 @@ public class Xcls_LeftProps : Object
 
                        // set gobject values
                        var child_1 = new Xcls_Box42( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
                }
 
@@ -1873,6 +1875,7 @@ public class Xcls_LeftProps : Object
                        this.el.has_frame = false;
                        this.el.label = "Delete";
                        var child_1 = new Xcls_Label44( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
 
                        //listeners
@@ -2441,6 +2444,7 @@ public class Xcls_LeftProps : Object
 
                        // set gobject values
                        var child_1 = new Xcls_Box54( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
                }
 

diff --git a/src/Builder4/WindowLeftTree.bjs b/src/Builder4/WindowLeftTree.bjs
index fd97955..bab93d9 100644 (file)
--- a/src/Builder4/WindowLeftTree.bjs
+++ b/src/Builder4/WindowLeftTree.bjs
@@ -3,6 +3,7 @@
  "gen_extended" : false,
  "items" : [
   {
+   "# Gee.ArrayList<Gtk.Widget>? error_widgets" : "null",
    "# Xcls_MainWindow? main_window" : "null",
    "# int last_error_counter" : "-1",
    "$ xns" : "Gtk",
@@ -1609,6 +1610,26 @@
    ],
    "| void removeErrors" : [
     "() {",
+    "\tif (this.error_widgets == null || this.error_widgets.size < 1) {",
+    " \t\treturn;",
+    "\t}",
+    "\tforeach(var child in this.error_widgets) {",
+    "\t",
+    "\t\tif (child.has_css_class(\"node-err\")) {",
+    "\t\t\tchild.remove_css_class(\"node-err\");",
+    "\t\t}",
+    "\t\tif (child.has_css_class(\"node-warn\")) {",
+    "\t\t\tchild.remove_css_class(\"node-warn\");",
+    "\t\t}",
+    "\t\t",
+    "\t\tif (child.has_css_class(\"node-depr\")) {",
+    "\t\t\tchild.remove_css_class(\"node-depr\");",
+    "\t\t}",
+    "\t}",
+    "\tthis.error_widgets  = null;",
+    "\treturn;",
+    "\t",
+    "\t/*",
     "\tvar  child = this.view.el.get_first_child(); ",
     " ",
     "\tvar reading_header = true;",
@@ -1647,6 +1668,7 @@
     "        child = child.get_next_sibling(); ",
     "\t}",
     "\t//GLib.debug(\"Rturning null\");",
+    "\t*/",
     "     ",
     "}"
    ],
@@ -1671,7 +1693,7 @@
     "\t\treturn;",
     "\t}",
     "\tthis.removeErrors();",
-    "\t",
+    "\tthis.error_widgets = new Gee.ArrayList<Gtk.Widget>();",
     "\tforeach(var diag in ar) { ",
     "\t",
     "\t\t ",
@@ -1688,6 +1710,7 @@
     "    \tif (w == null) {",
     "    \t\treturn;",
     "\t\t}",
+    "\t\tthis.error_widgets.add(w);",
     "\t\t// always show errors.",
     "\t\tvar ed = diag.category.down();",
     "\t\tif (ed != \"err\" && w.has_css_class(\"node-err\")) {",

diff --git a/src/Builder4/WindowLeftTree.vala b/src/Builder4/WindowLeftTree.vala
index 6cfa983..06cd3ad 100644 (file)
--- a/src/Builder4/WindowLeftTree.vala
+++ b/src/Builder4/WindowLeftTree.vala
@@ -27,6 +27,7 @@ public class Xcls_WindowLeftTree : Object
        public int last_error_counter;
        public signal void changed ();
        public signal void node_selected (JsRender.Node? node);
+       public Gee.ArrayList<Gtk.Widget>? error_widgets;
 
        // ctor
        public Xcls_WindowLeftTree()
@@ -37,6 +38,7 @@ public class Xcls_WindowLeftTree : Object
                // my vars (dec)
                this.main_window = null;
                this.last_error_counter = -1;
+               this.error_widgets = null;
 
                // set gobject values
                this.el.hexpand = true;
@@ -69,7 +71,7 @@ public class Xcls_WindowLeftTree : Object
                        return;
                }
                this.removeErrors();
-               
+               this.error_widgets = new Gee.ArrayList<Gtk.Widget>();
                foreach(var diag in ar) { 
                
                         
@@ -86,6 +88,7 @@ public class Xcls_WindowLeftTree : Object
                if (w == null) {
                        return;
                        }
+                       this.error_widgets.add(w);
                        // always show errors.
                        var ed = diag.category.down();
                        if (ed != "err" && w.has_css_class("node-err")) {
@@ -111,6 +114,26 @@ public class Xcls_WindowLeftTree : Object
        //      _this.maincol.el.set_max_width( _this.viewwin.el.get_width()  - 32 );
        }
        public void removeErrors () {
+               if (this.error_widgets == null || this.error_widgets.size < 1) {
+                       return;
+               }
+               foreach(var child in this.error_widgets) {
+               
+                       if (child.has_css_class("node-err")) {
+                               child.remove_css_class("node-err");
+                       }
+                       if (child.has_css_class("node-warn")) {
+                               child.remove_css_class("node-warn");
+                       }
+                       
+                       if (child.has_css_class("node-depr")) {
+                               child.remove_css_class("node-depr");
+                       }
+               }
+               this.error_widgets  = null;
+               return;
+               
+               /*
                var  child = this.view.el.get_first_child(); 
         
                var reading_header = true;
@@ -149,6 +172,7 @@ public class Xcls_WindowLeftTree : Object
                child = child.get_next_sibling(); 
                }
                //GLib.debug("Rturning null");
+               */
             
        }
        public JsRender.Node? getActiveElement () { // return path to actie node.
@@ -1855,6 +1879,7 @@ public class Xcls_WindowLeftTree : Object
 
                        // set gobject values
                        var child_1 = new Xcls_Box18( _this );
+                       child_1.ref();
                        this.el.child = child_1.el;
                }