From: Alan Knowles <alan@roojs.com>
Date: Tue, 2 Jun 2015 13:01:31 +0000 (+0800)
Subject: src/Builder4/GtkView.bjs
X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=commitdiff_plain;h=7eff5d33ce2fc17b4c92df8e7c12f31d59dcd870

src/Builder4/GtkView.bjs
src/Builder4/GtkView.vala
---

diff --git a/src/Builder4/GtkView.bjs b/src/Builder4/GtkView.bjs
index 9d6154325..2af5f21cb 100644
--- a/src/Builder4/GtkView.bjs
+++ b/src/Builder4/GtkView.bjs
@@ -18,7 +18,7 @@
    "| void loadFile" : "(JsRender.JsRender file) \n{\n        this.file = null;\n        \n        if (file.tree == null) {\n            return;\n        }\n        this.notebook.el.page = 0;// gtk preview \n   \n  \n        \n       this.file = file;     \n        this.sourceview.loadFile();\n        \n        \n\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,
    "bool hexpand" : true,
-   "| int search" : "(string txt) {\n \tvar s = new Gtk.SourceSearchSettings();\n\tvar buf = (Gtk.SourceBuffer) this.sourceview.el.get_buffer();\n\tthis.searchcontext = new Gtk.SourceSearchContext(buf,s);\n\tthis.searchcontext.set_highlight(true);\n\ts.set_search_text(txt);\n\treturn this.searchcontext.get_occurrences_count();\n\n   \n}\n",
+   "| int search" : "(string txt) {\n \tvar s = new Gtk.SourceSearchSettings();\n\tvar buf = (Gtk.SourceBuffer) this.sourceview.el.get_buffer();\n\tthis.searchcontext = new Gtk.SourceSearchContext(buf,s);\n\tthis.searchcontext.set_highlight(true);\n\ts.set_search_text(txt);\n\t\n\tGtk.TextIter beg, st,en;\n\tthis.searchcontext.forward(beg, out st, out en);\n\t\n\treturn this.searchcontext.get_occurrences_count();\n\n   \n}\n",
    "xtype" : "Box",
    "Gtk.SourceSearchContext searchcontext" : "",
    "# JsRender.JsRender file" : "null",
diff --git a/src/Builder4/GtkView.vala b/src/Builder4/GtkView.vala
index 23c68ee30..6c515533f 100644
--- a/src/Builder4/GtkView.vala
+++ b/src/Builder4/GtkView.vala
@@ -178,6 +178,10 @@ public class Xcls_GtkView : Object
     	this.searchcontext = new Gtk.SourceSearchContext(buf,s);
     	this.searchcontext.set_highlight(true);
     	s.set_search_text(txt);
+    	
+    	Gtk.TextIter beg, st,en;
+    	this.searchcontext.forward(beg, out st, out en);
+    	
     	return this.searchcontext.get_occurrences_count();