src/Builder4/GtkView.bjs

src/Builder4/GtkView.vala

diff --git a/src/Builder4/GtkView.bjs b/src/Builder4/GtkView.bjs
index f3eb299..db238ca 100644 (file)
--- a/src/Builder4/GtkView.bjs
+++ b/src/Builder4/GtkView.bjs
@@ -12,8 +12,8 @@
     "size_allocate" : "(aloc) => {\n\n    this.width = aloc.width;\n    this.height =aloc.height;\n    }\n"
    },
    "id" : "GtkView",
-   "| void createThumb" : "() {\n    \n    \n    if (this.file == null) {\n        return;\n    }\n    var filename = this.file.getIconFileName(false);\n    \n    var  win = this.el.get_parent_window();\n    var width = win.get_width();\n    var height = win.get_height();\n\n    Gdk.Pixbuf screenshot = Gdk.pixbuf_get_from_window(win, 0, 0, width, height); // this.el.position?\n\n    screenshot.save(filename,\"png\");\n    return;\n    \n    \n    \n    \n    \n     \n    \n    // should we hold until it's printed...\n    \n      \n\n    \n    \n\n\n    \n     \n}\n",
    "# Gtk.Widget lastObj" : "null",
+   "| void createThumb" : "() {\n    \n    \n    if (this.file == null) {\n        return;\n    }\n    var filename = this.file.getIconFileName(false);\n    \n    var  win = this.el.get_parent_window();\n    var width = win.get_width();\n    var height = win.get_height();\n\n    Gdk.Pixbuf screenshot = Gdk.pixbuf_get_from_window(win, 0, 0, width, height); // this.el.position?\n\n    screenshot.save(filename,\"png\");\n    return;\n    \n    \n    \n    \n    \n     \n    \n    // should we hold until it's printed...\n    \n      \n\n    \n    \n\n\n    \n     \n}\n",
    "| void loadFile" : "(JsRender.JsRender file) \n{\n        this.file = null;\n        \n        if (file.tree == null) {\n            return;\n        }\n        this.file = file;\n        if (this.lastObj != null) {\n            this.container.el.remove(this.lastObj);\n        }\n        \n        // hide the compile view at present..\n          \n        \n        var w = this.width;\n        var h = this.height;\n        \n        print(\"ALLOC SET SIZES %d, %d\\n\", w,h); \n        \n        // set the container size min to 500/500 or 20 px less than max..\n        w = int.max (w-20, 500);\n        h = int.max (h-20, 500); \n        \n        print(\"SET SIZES %d, %d\\n\", w,h);       \n        _this.container.el.set_size_request(w,h);\n        \n        _this.view_layout.el.set_size(w,h); // should be baded on calc.. -- see update_scrolled.\n        var rgba = Gdk.RGBA ();\n        rgba.parse (\"#ccc\");\n        _this.view_layout.el.override_background_color(Gtk.StateFlags.NORMAL, rgba);\n        \n        \n\tvar x = new JsRender.NodeToGtk(file.tree);\n        var obj = x.munge() as Gtk.Widget;\n        this.lastObj = null;\n\tif (obj == null) {\n        \treturn;\n\t}\n\tthis.lastObj = obj;\n        \n        this.container.el.add(obj);\n        obj.show_all();\n        \n         \n        \n}\n ",
    "int width" : 0,
    "xtype" : "VBox",
@@ -29,15 +29,15 @@
      "items" : [
       {
        "id" : "label_preview",
-       "* pack" : false,
        "xtype" : "Label",
+       "* pack" : false,
        "$ xns" : "Gtk",
        "utf8 label" : "Preview"
       },
       {
        "id" : "label_code",
-       "xtype" : "Label",
        "* pack" : false,
+       "xtype" : "Label",
        "$ xns" : "Gtk",
        "utf8 label" : "Code"
       },
@@ -48,14 +48,14 @@
        "items" : [
         {
          "id" : "view_layout",
-         "xtype" : "Layout",
          "* pack" : "add",
+         "xtype" : "Layout",
          "$ xns" : "Gtk",
          "items" : [
           {
            "id" : "container",
-           "* pack" : "put,10,10",
            "xtype" : "HBox",
+           "* pack" : "put,10,10",
            "$ xns" : "Gtk"
           }
          ]
@@ -71,7 +71,7 @@
          "gboolean show_line_marks" : true,
          "id" : "sourceview",
          "* init" : "{\n   \n       var description =   Pango.FontDescription.from_string(\"monospace\");\n    description.set_size(8000);\n    this.el.override_font(description);\n\n  \n  \n  \n    var attrs = new Gtk.SourceMarkAttributes();\n    var  pink = new Gdk.RGBA();\n    pink.parse ( \"pink\");\n    attrs.set_background ( pink);\n    attrs.set_icon_name ( \"process-stop\");    \n    attrs.query_tooltip_text.connect(( mark) => {\n        //print(\"tooltip query? %s\\n\", mark.name);\n        return mark.name;\n    });\n    \n    this.el.set_mark_attributes (\"error\", attrs, 1);\n    \n     var wattrs = new Gtk.SourceMarkAttributes();\n    var  blue = new Gdk.RGBA();\n    blue.parse ( \"blue\");\n    wattrs.set_background ( blue);\n    wattrs.set_icon_name ( \"process-stop\");    \n    wattrs.query_tooltip_text.connect(( mark) => {\n        //print(\"tooltip query? %s\\n\", mark.name);\n        return mark.name;\n    });\n    \n    this.el.set_mark_attributes (\"warning\", wattrs, 1);\n    \n \n    \n     var dattrs = new Gtk.SourceMarkAttributes();\n    var  purple = new Gdk.RGBA();\n    purple.parse ( \"purple\");\n    dattrs.set_background ( purple);\n    dattrs.set_icon_name ( \"process-stop\");    \n    dattrs.query_tooltip_text.connect(( mark) => {\n        //print(\"tooltip query? %s\\n\", mark.name);\n        return mark.name;\n    });\n    \n    this.el.set_mark_attributes (\"warning\", dattrs, 1);\n    \n    \n    var gattrs = new Gtk.SourceMarkAttributes();\n    var  grey = new Gdk.RGBA();\n    purple.parse ( \"grey\");\n    gattrs.set_background ( grey);\n \n    \n    this.el.set_mark_attributes (\"grey\", gattrs, 1);\n    \n    \n    \n    \n    \n    \n}\n ",
-         "| void nodeSelected" : "(JsRender.Node? sel) {\n\n    // this is connected in widnowstate\n    print(\"node selected\");\n    var buf = this.el.get_buffer();\n    buf.set_text(\"\",0);\n    var sbuf = (Gtk.SourceBuffer) buf;\n\n    \n    var f =  _this.main_window.windowstate.left_tree.model.file;\n    if (f == null || f.xtype != \"Gtk\") {\n        print(\"xtype != Gtk\");\n        return;\n    }\n    \n    var str = JsRender.NodeToVala.mungeFile(f);\n    print(\"setting str %d\\n\", str.length);\n    buf.set_text(str, str.length);\n    var lm = Gtk.SourceLanguageManager.get_default();\n    \n    var lang = f.language;\n    //?? is javascript going to work as js?\n    \n    ((Gtk.SourceBuffer)(buf)) .set_language(lm.get_language(lang));\n \n    if (sel == null) {\n        // no highlighting..\n        return;\n    }\n    // clear all the marks..\n     Gtk.TextIter start;\n    Gtk.TextIter end;     \n    Gtk.TextIter iter;     \n    sbuf.get_bounds (out start, out end);\n    sbuf.remove_source_marks (start, end, null);\n    \n    for (var i = 0; i < buf.get_line_count();i++) {\n        if (i < sel.line_start || i > sel.line_end) {\n            buf.get_iter_at_line(out iter, i);\n            sbuf.create_source_mark(\"\", \"grey\", iter);\n        }\n    \n    }\n    \n    \n}\n",
+         "| void nodeSelected" : "(JsRender.Node? sel) {\n\n    // this is connected in widnowstate\n    print(\"node selected\");\n    var buf = this.el.get_buffer();\n    buf.set_text(\"\",0);\n    var sbuf = (Gtk.SourceBuffer) buf;\n\n    \n    var f =  _this.main_window.windowstate.left_tree.model.file;\n    if (f == null || f.xtype != \"Gtk\") {\n        print(\"xtype != Gtk\");\n        return;\n    }\n    \n    var str = JsRender.NodeToVala.mungeFile(f);\n    print(\"setting str %d\\n\", str.length);\n    buf.set_text(str, str.length);\n    var lm = Gtk.SourceLanguageManager.get_default();\n    \n    var lang = f.language;\n    //?? is javascript going to work as js?\n    \n    ((Gtk.SourceBuffer)(buf)) .set_language(lm.get_language(lang));\n \n    if (sel == null) {\n        // no highlighting..\n        return;\n    }\n    // clear all the marks..\n     Gtk.TextIter start;\n    Gtk.TextIter end;     \n    Gtk.TextIter iter;     \n    sbuf.get_bounds (out start, out end);\n    sbuf.remove_source_marks (start, end, null);\n    \n    for (var i = 0; i < buf.get_line_count();i++) {\n        if (i < sel.line_start || i > sel.line_end) {\n            if (buf.get_iter_at_line(out iter, i)) {\n                sbuf.create_source_mark(\"\", \"grey\", iter);\n            }\n        }\n    \n    }\n    \n    \n}\n",
          "* pack" : "add",
          "xtype" : "SourceView",
          "$ xns" : "Gtk",

diff --git a/src/Builder4/GtkView.vala b/src/Builder4/GtkView.vala
index 7ac3ad7..8bfd29a 100644 (file)
--- a/src/Builder4/GtkView.vala
+++ b/src/Builder4/GtkView.vala
@@ -434,8 +434,9 @@ public class Xcls_GtkView : Object
             
             for (var i = 0; i < buf.get_line_count();i++) {
                 if (i < sel.line_start || i > sel.line_end) {
-                    buf.get_iter_at_line(out iter, i);
-                    sbuf.create_source_mark("", "grey", iter);
+                    if (buf.get_iter_at_line(out iter, i)) {
+                        sbuf.create_source_mark("", "grey", iter);
+                    }
                 }
             
             }