src/Builder4/MainWindow.vala

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

diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala
index 9237fa5..83382ef 100644 (file)
--- a/src/Builder4/MainWindow.vala
+++ b/src/Builder4/MainWindow.vala
@@ -117,7 +117,7 @@ public class Xcls_MainWindow : Object
                        
                          if (event.keyval == Gdk.Key.g && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {
                            print("SAVE: ctrl-g  pressed");
-                               this.search_entry.forwardSearch();
+                               this.search_entry.forwardSearch(true);
                            return false;
                        }
                }    
@@ -2322,7 +2322,7 @@ public class Xcls_MainWindow : Object
 
     public class Xcls_search_entry : Object
     {
-        public Gtk.Entry el;
+        public Gtk.SearchEntry el;
         private Xcls_MainWindow  _this;
 
 
@@ -2333,7 +2333,7 @@ public class Xcls_MainWindow : Object
         {
             _this = _owner;
             _this.search_entry = this;
-            this.el = new Gtk.Entry();
+            this.el = new Gtk.SearchEntry();
 
             // my vars (dec)
 
@@ -2346,6 +2346,18 @@ public class Xcls_MainWindow : Object
                 this.el.override_font(description);
 
             //listeners
+            this.el.key_press_event.connect( (event) => {
+                
+               if (event.keyval == Gdk.Key.Return) {
+                       this.forwardSearch(false);
+                   return true;
+            
+               }    
+               // print(event.key.keyval)
+                
+                return false;
+            
+            });
             this.el.changed.connect( () => {
                if (this.el.text == "") {
                        return;
@@ -2380,22 +2392,24 @@ public class Xcls_MainWindow : Object
         }
 
         // user defined functions
-        public void forwardSearch () {
+        public void forwardSearch (bool change_focus) {
                switch(_this.windowstate.state) {
                        case WindowState.State.CODEONLY:
                        case WindowState.State.CODE:
                                // search the code being edited..
-                               _this.windowstate.code_editor.forwardSearch();
+                               _this.windowstate.code_editor.forwardSearch(change_focus);
                                
                                break;
                        case WindowState.State.PREVIEW:
                                if (_this.windowstate.file.xtype == "Gtk") {
-                                       _this.windowstate.window_gladeview.forwardSearch();
+                                       _this.windowstate.window_gladeview.forwardSearch(change_focus);
+                               } else { 
+                                        _this.windowstate.window_rooview.forwardSearch(change_focus);
                                }
                        
-                       
                                break;
                }
+               
         }
     }