Fix #8003 - undo code

[roobuilder] / src / Builder4 / WindowLeftTree.bjs

diff --git a/src/Builder4/WindowLeftTree.bjs b/src/Builder4/WindowLeftTree.bjs
index f2ea2be..641f61d 100644 (file)
--- a/src/Builder4/WindowLeftTree.bjs
+++ b/src/Builder4/WindowLeftTree.bjs
@@ -605,7 +605,7 @@
            "\t\t",
            "\t\t var m = (GLib.ListStore) _this.model.el.model;",
            "     \t_this.main_window.windowstate.file.tree = dropNode;  ",
-           "    ",
+           "    \tdropNode.updated_count++;",
            "   ",
            "\t\tm.append(dropNode);",
            "\t\t_this.model.selectNode(dropNode); \t",
@@ -665,7 +665,7 @@
            "\t\t \t\t_this.view.dragNode.remove();",
            "\t \t\t}",
            "\t \t\t\t",
-           "\t \t\t",
+           "\t \t\tdropNode.updated_count++;",
            " \t\t\t_this.model.selectNode(dropNode); ",
            " \t\t\t",
            " \t\t\t_this.changed();\t\t\t\t \t\t",
@@ -679,7 +679,7 @@
            "\t\t \t\t_this.model.selectNode(null); \t \t\t",
            "\t\t \t\t_this.view.dragNode.remove();",
            "\t \t\t}",
-           "\t",
+           "\t\t\tdropNode.updated_count++;",
            " \t\t\t_this.model.selectNode(dropNode); \t\t\t",
            " \t\t\t_this.changed();",
            " \t\t\treturn true;",
@@ -693,6 +693,7 @@
            "\t",
            " \t\t\t",
            " \t\t\tnode.parent.insertAfter(dropNode, node);",
+           " \t\t\tdropNode.updated_count++;",
            " \t\t\t_this.model.selectNode(dropNode);\t",
            " \t\t\t_this.changed();",
            " \t\t\t// select it",
@@ -908,7 +909,7 @@
             "\tfor (var i = 0; i < s.n_items; i++) {",
             "\t\t//GLib.debug(\"check node %s\", s.get_item(i).get_type().name());",
             "\t\tvar lr = s.get_item(i) as Gtk.TreeListRow;",
-            "\t\tGLib.debug(\"check node %s\", lr.get_item().get_type().name());",
+            "\t\t//GLib.debug(\"check node %s\", lr.get_item().get_type().name());",
             "\t\tif ((lr.get_item() as JsRender.Node).oid == node.oid) {",
             "\t\t\treturn i;",
             "\t\t\t",
@@ -1385,7 +1386,7 @@
         "    \tvar reading_header = true;",
         "\t ",
         "    \twhile (child != null) {",
-        "\t\t\tGLib.debug(\"Got %s\", child.get_type().name());",
+        "\t\t\t//GLib.debug(\"Got %s\", child.get_type().name());",
         "    \t   ",
         "    \t   if (reading_header) {",
         "\t\t\t\t",
@@ -1420,36 +1421,36 @@
        ],
        "| int getColAt" : [
         "(double x,  double y) {",
-        "/*",
-        "    \t",
-        "from    \thttps://discourse.gnome.org/t/gtk4-finding-a-row-data-on-gtkcolumnview/8465",
-        "    \t  ",
-        "    \t*/",
-        "\t\t//Gtk.Allocation alloc = { 0, 0, 0, 0 };",
-        "\t\t//GLib.debug(\"Cehck %d, %d\", x,y);",
-        "        var  child = this.el.get_first_child(); ",
-        "    \t ",
-        "    \tvar col = 0;",
-        "    \tvar offx = 0;",
-        "    \twhile (child != null) {",
-        "\t\t\t",
-        "\t\t\tif (child.get_type().name() == \"GtkColumnViewRowWidget\") {",
-        "\t\t\t\tchild = child.get_first_child();",
-        "\t\t\t\tcontinue;",
-        "\t\t\t}",
+        "\t/*",
         "\t\t\t",
-        "\t\t\t//child.get_allocation(out alloc);",
-        "\t\t\tif (x <  (child.get_width() + offx)) {",
-        "\t\t\t\treturn col;",
-        "\t\t\t}",
-        "\t\t\treturn 1;",
-        "\t\t\t//offx += child.get_width();",
-        "\t\t\t//col++;",
-        "\t\t\t//child = child.get_next_sibling();",
+        "\tfrom    \thttps://discourse.gnome.org/t/gtk4-finding-a-row-data-on-gtkcolumnview/8465",
+        "    \t  ",
+        "\t*/",
+        "\t//Gtk.Allocation alloc = { 0, 0, 0, 0 };",
+        "\t//GLib.debug(\"Cehck %d, %d\", x,y);",
+        "    var  child = this.el.get_first_child(); ",
+        "\t ",
+        "\tvar col = 0;",
+        "\tvar offx = 0;",
+        "\twhile (child != null) {",
+        "\t\t",
+        "\t\tif (child.get_type().name() == \"GtkColumnViewRowWidget\") {",
+        "\t\t\tchild = child.get_first_child();",
+        "\t\t\tcontinue;",
         "\t\t}",
-        "    \t     ",
-        "\t\t\t  ",
-        "        return -1;",
+        "\t\t",
+        "\t\t//child.get_allocation(out alloc);",
+        "\t\tif (x <  (child.get_width() + offx)) {",
+        "\t\t\treturn col;",
+        "\t\t}",
+        "\t\treturn 1;",
+        "\t\t//offx += child.get_width();",
+        "\t\t//col++;",
+        "\t\t//child = child.get_next_sibling();",
+        "\t}",
+        "\t     ",
+        "\t\t  ",
+        "    return -1;",
         "",
         " }"
        ],
@@ -1471,7 +1472,7 @@
         "    \t*/",
         " \t\t ",
         " \t\t",
-        " \t\t//GLib.debug(\"offset = %d  y = %d\", (int) voff, (int) in_y);",
+        " \t\tGLib.debug(\"get Widget At Row x = %d  y = %d\", (int) x, (int) in_y);",
         "    \tvar y = in_y + _this.viewwin.el.vadjustment.value; ",
         "        var  child = this.el.get_first_child(); ",
         "    \t//Gtk.Allocation alloc = { 0, 0, 0, 0 };",
@@ -1713,7 +1714,7 @@
     "\t\t ",
     "\t\t\t",
     "\t\t\treading_header = false;",
-    "\t\t\t ",
+    "\t\t\t continue;",
     "\t    }",
     "\t    ",
     "\t  \tif (child.has_css_class(\"node-err\")) {",
@@ -1736,8 +1737,12 @@
    "| void updateErrors" : [
     "() {",
     "\tvar file = this.getActiveFile();",
+    "\tif (file == null) {",
+    "\t\treturn;",
+    "\t}",
+    "\t",
     "\tvar ar = file.getErrors();",
-    "\t\tif (ar.size < 1) {",
+    "\tif (ar == null || ar.size < 1) {",
     "\t\tif (this.last_error_counter != file.error_counter) {",
     "\t\t\tthis.removeErrors();",
     "\t\t}",