fix last merge - highlight support

[roobuilder] / src / Builder4 / WindowLeftProps.bjs

diff --git a/src/Builder4/WindowLeftProps.bjs b/src/Builder4/WindowLeftProps.bjs
index f84d8fa..8d82cc8 100644 (file)
--- a/src/Builder4/WindowLeftProps.bjs
+++ b/src/Builder4/WindowLeftProps.bjs
@@ -18,6 +18,7 @@
    "bool loading" : false,
    "bool vexpand" : true,
    "id" : "LeftProps",
+   "int last_error_counter" : "-1",
    "items" : [
     {
      "$ xns" : "Gtk",
@@ -672,6 +673,19 @@
           "\t ",
           "}"
          ],
+         "| int propToRow" : [
+          "(JsRender.NodeProp prop) {",
+          "\tfor (var i = 0 ; i < this.el.n_items; i++) {",
+          "\t\tvar r = (JsRender.NodeProp)this.el.get_item(i);",
+          "\t\tif (r.equals(prop)) {",
+          "\t\t\treturn i;",
+          "\t\t\t",
+          "\t\t}",
+          "\t}",
+          "\treturn -1;",
+          "\t ",
+          "}"
+         ],
          "| void selectProp" : [
           "(JsRender.NodeProp prop) {",
           "\tfor (var i = 0 ; i < this.el.n_items; i++) {",
@@ -1103,7 +1117,7 @@
         "\t\t\t\theader_height =  h;",
         "\t\t\t\t",
         "\t\t\t\treading_header = false;",
-        "\t\t\t\tcontinue;",
+        "\t\t\t\t",
         "\t        }",
         "\t        ",
         "\t\t    if (child.get_type().name() != \"GtkColumnViewRowWidget\") {",
@@ -1461,8 +1475,15 @@
     "\t\t\t ",
     "\t    }",
     "\t    ",
-    "\t  \tif (!child.has_css_class(\"error-node\")) {",
-    "\t\t\tchild.remove_css_class(\"error-node\");",
+    "\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\t",
     "        child = child.get_next_sibling(); ",
@@ -1504,8 +1525,18 @@
     "    \tif (w == null) {",
     "    \t\treturn;",
     "\t\t}",
-    "\t\tif (!w.has_css_class(\"node-error\")) {",
-    "\t\t\tw.add_css_class(\"node-error\");",
+    "\t  \t\tvar ed = diag.category.down();",
+    "\t\tif (ed != \"err\" && w.has_css_class(\"node-err\")) {",
+    "\t\t\tcontinue;",
+    "\t\t}",
+    "\t\tif (ed == \"err\" && w.has_css_class(\"node-warn\")) {",
+    "\t\t\tw.remove_css_class(\"node-warn\");",
+    "\t\t}",
+    "\t\tif (ed == \"err\" && w.has_css_class(\"node-depr\")) {",
+    "\t\t\tw.remove_css_class(\"node-depr\");",
+    "\t\t}",
+    "\t\tif (!w.has_css_class(\"node-\"+ ed)) {",
+    "\t\t\tw.add_css_class(\"node-\" + ed);",
     "\t\t}",
     "\t\t",
     "\t}",
@@ -1515,4 +1546,4 @@
   }
  ],
  "name" : "WindowLeftProps"
-}
+}
\ No newline at end of file