Fix #8089 - phase 1 - code ast navigation

[roobuilder] / src / JsRender / NodeToVala.vala

diff --git a/src/JsRender/NodeToVala.vala b/src/JsRender/NodeToVala.vala
index 5791c99..6490629 100644 (file)
--- a/src/JsRender/NodeToVala.vala
+++ b/src/JsRender/NodeToVala.vala
@@ -417,15 +417,15 @@ public abstract class JsRender.NodeToVala : NodeWriter {
                                if (this.node.fqn() == "Gtk.NotebookPage") {
                                        switch (child.get_prop("* prop").val) {
                                                case "child":
-                                                       nb_child = childname;
+                                                       nb_child = childname + (this.this_el == "this.el." ? ".el" : "");
                                                        break;
                                                        
                                                case "tab":
-                                                       nb_tab = childname;
+                                                       nb_tab = childname + (this.this_el == "this.el." ? ".el" : "");
                                                        break;
                                                        
                                                case "menu":
-                                                       nb_menu = childname;
+                                                       nb_menu = childname + (this.this_el == "this.el." ? ".el" : ""); 
                                                        break;
                                        }
                                        continue;
@@ -467,19 +467,21 @@ public abstract class JsRender.NodeToVala : NodeWriter {
                
                GLib.debug("got node %s with nb_child= %s", this.node.fqn() , nb_child);
                if (this.node.fqn() == "Gtk.NotebookPage" && nb_child != "") {
+                       var nb = (this.this_el == "this.el." ? "notebook.el" : "notebook");
+                       
                        if (nb_tab == "" && this.node.has("tab_label")) {
                                nb_tab = "new Gtk.Label(this.tab_label)";
                        }
                 
                        if (nb_menu == "" && nb_tab == "") {
-                               this.addLine(@"$(ipad)notebook.el.append_page( $(nb_child)  );");
+                               this.addLine(@"$(ipad)$(nb).append_page( $(nb_child)  );");
                                return;
                        }
                        if (nb_menu == "") {
-                               this.addLine(@"$(ipad)notebook.el.append_page( $(nb_child) , $(nb_tab) );");
+                               this.addLine(@"$(ipad)$(nb).append_page( $(nb_child) , $(nb_tab) );");
                                return;
                        }
-                       this.addLine(@"$(ipad)notebook.el.append_page_menu( $(nb_child) , $(nb_tab), $(nb_menu) );");
+                       this.addLine(@"$(ipad)$(nb).append_page_menu( $(nb_child) , $(nb_tab), $(nb_menu) );");
                
                }