Fix #7297 - filter objects on roo

diff --git a/src/Palete/Gir.vala b/src/Palete/Gir.vala
index ad708ea..eed7cf7 100644 (file)
--- a/src/Palete/Gir.vala
+++ b/src/Palete/Gir.vala
@@ -243,14 +243,18 @@ namespace Palete {
                        if (type.length < 1 || type.contains(".")) {
                                return "null";
                        }
-                       switch(type) {
+                       switch(type.down()) {
+                               case "boolean":
+                               case "bool":
                                case "gboolean":
                                        return "true";
+                               case "int":                                     
                                case "guint":
                                        return "0";
                                case "gdouble":
                                        return "0f";
                                case "utf8":
+                               case "string":
                                        return "\"\"";
                                default:
                                        return "?"+  type + "?";

diff --git a/src/Palete/GirObject.vala b/src/Palete/GirObject.vala
index 0554592..21c9377 100644 (file)
--- a/src/Palete/GirObject.vala
+++ b/src/Palete/GirObject.vala
@@ -447,10 +447,18 @@ namespace Palete {
                        
                        // does not handle Enums... - no need to handle anything else.
                        var def = this.type.contains(".") ?  "" :  Gir.guessDefaultValueForType(this.type);
-                       if (this.type.contains(".") || this.type.down() == "function") {
+                       if (this.type.contains(".") ) {
                                return  new JsRender.NodeProp.raw(this.name, this.type, def);
                        }
-                       
+                       if (this.type.down() == "function"  ) {
+                               return  new JsRender.NodeProp.raw(this.name, this.type, "function()\n{\n\n}");
+                       }
+                       if (this.type.down() == "array"  ) {
+                               return  new JsRender.NodeProp.raw(this.name, this.type, "[\n\n]");
+                       }
+                       if (this.type.down() == "object"  ) {
+                               return  new JsRender.NodeProp.raw(this.name, this.type, "{\n\n}");
+                       }
                        return  new JsRender.NodeProp.prop(this.name, this.type, def); // signature?
                
                }

diff --git a/src/Palete/Roo.vala b/src/Palete/Roo.vala
index 737501e..978f6f5 100644 (file)
--- a/src/Palete/Roo.vala
+++ b/src/Palete/Roo.vala
@@ -248,7 +248,7 @@ namespace Palete {
                                
                                
                                case JsRender.NodePropType.PROP:
-                                       return cls.props;
+                                       return  this.filterProps(cls.props);
                                case JsRender.NodePropType.LISTENER:
                                        return cls.signals;
                                case JsRender.NodePropType.METHOD:
@@ -268,6 +268,44 @@ namespace Palete {
 
                         
                }
+               
+               
+               public Gee.HashMap<string,GirObject>  filterProps(Gee.HashMap<string,GirObject> props)
+               {
+                       // we shold probably cache this??
+                       
+                       var outprops = new Gee.HashMap<string,GirObject>(); 
+                       
+                       foreach(var k in props.keys) {
+                               var val = props.get(k);
+                               
+                               // special props..
+                               switch(k) {
+                                       case "listeners" : 
+                                               continue;
+                                       default:
+                                               break;
+                               }
+                               
+                                
+                               if (!val.type.contains(".")) {
+                                       outprops.set(k,val);
+                                       continue;
+                               }
+                               
+                               
+                                
+                               // do nothing? - classes not allowed?
+                               
+                       }
+                       
+                       
+                       return outprops;
+               
+               
+               }
+               
+               
                public string[] getInheritsFor(string ename)
                {
                        string[] ret = {};