src/Builder4/Editor.bjs

[app.Builder.js] / src / Builder4 / Editor.vala

diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala
index 9a19e68..63646ac 100644 (file)
--- a/src/Builder4/Editor.vala
+++ b/src/Builder4/Editor.vala
@@ -24,7 +24,6 @@ public class Editor : Object
     public int pos_root_x;
     public int pos_root_y;
     public string ptype;
-    public string fname;
     public string key;
     public JsRender.JsRender file;
     public bool pos;
@@ -42,7 +41,6 @@ public class Editor : Object
         this.window = null;
         this.activeEditor = "";
         this.ptype = "";
-        this.fname = "";
         this.key = "";
         this.file = null;
         this.pos = false;
@@ -100,7 +98,7 @@ public class Editor : Object
         return true;
     
     }
-    public   void show (JsRender.JsRender file, JsRender.Node node, string ptype, string key)
+    public   void show (JsRender.JsRender file, JsRender.Node? node, string ptype, string key)
     {
         this.file = file;    
         this.ptype = "";
@@ -129,7 +127,7 @@ public class Editor : Object
     
         }
         this.key_edit.el.text = key;  
-         
+           
     }
     public class Xcls_Box2 : Object
     {
@@ -466,14 +464,13 @@ public class Editor : Object
                 return true;
             }
             
-            if (_this.file == null && _this.fname.length > 0) {
+            if (_this.file.xtype == "PlainFile") {
             
                 // assume it's gtk...
                    this.check_running = true;
         
                  _this.window.windowstate.valasource.checkPlainFileSpawn(
-                    _this.window.project,
-                   _this.fname,
+                  _this.file,
                    str
                 );
                 return true;
@@ -547,8 +544,14 @@ public class Editor : Object
             
             
             var err = obj.get_object_member(type);
-            var valafn = _this.fname;
-            if (_this.file != null) {
+            
+            
+            if (_this.file == null) {
+                return;
+            
+            }
+            var valafn = _this.file.path;
+            if (_this.file.xtype != "PlainFile") {