src/Builder4/Editor.bjs

src/Builder4/Editor.vala

diff --git a/src/Builder4/Editor.bjs b/src/Builder4/Editor.bjs
index 1e85293..7fcf326 100644 (file)
--- a/src/Builder4/Editor.bjs
+++ b/src/Builder4/Editor.bjs
@@ -825,9 +825,29 @@
     ""
    ],
    "| void backSearch" : [
-    "() {",
+    "(bool change_focus) {",
     "",
-    "}"
+    "\tif (this.searchcontext == null) {",
+    "\t\treturn;",
+    "\t} ",
+    "\t",
+    "\tGtk.TextIter beg, st,en;",
+    "\t ",
+    "\tthis.buffer.el.get_iter_at_offset(out beg, this.last_search_end);",
+    "\tif (!this.searchcontext.back(beg, out st, out en)) {",
+    "\t",
+    "\t\tthis.last_search_end = 0;",
+    "\t} else {",
+    "\t\tthis.last_search_end = en.get_offset();",
+    "\t\tif (change_focus) {",
+    "\t\t\tthis.view.el.grab_focus();",
+    "\t\t}",
+    "\t\tthis.buffer.el.place_cursor(st);",
+    "\t\tthis.view.el.scroll_to_iter(st,  0.1f, true, 0.0f, 0.5f);",
+    "\t}",
+    " ",
+    "}",
+    ""
    ],
    "| void forwardSearch" : [
     "(bool change_focus) {",

diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala
index 052d6e5..edeae34 100644 (file)
--- a/src/Builder4/Editor.vala
+++ b/src/Builder4/Editor.vala
@@ -143,8 +143,27 @@ public class Editor : Object
         }
      
     }
-    public void backSearch () {
+    public void backSearch (bool change_focus) {
     
+       if (this.searchcontext == null) {
+               return;
+       } 
+       
+       Gtk.TextIter beg, st,en;
+        
+       this.buffer.el.get_iter_at_offset(out beg, this.last_search_end);
+       if (!this.searchcontext.back(beg, out st, out en)) {
+       
+               this.last_search_end = 0;
+       } else {
+               this.last_search_end = en.get_offset();
+               if (change_focus) {
+                       this.view.el.grab_focus();
+               }
+               this.buffer.el.place_cursor(st);
+               this.view.el.scroll_to_iter(st,  0.1f, true, 0.0f, 0.5f);
+       }
+     
     }
     public int search (string txt) {