Fix #7369 - fix goto line

diff --git a/src/Builder4/GtkView.bjs b/src/Builder4/GtkView.bjs
index 494783e..5d46166 100644 (file)
--- a/src/Builder4/GtkView.bjs
+++ b/src/Builder4/GtkView.bjs
@@ -1014,12 +1014,12 @@
    ],
    "| void scroll_to_line" : [
     "(int line) {",
-    "   this.notebook.el.page = 1;// code preview...",
+    "  // code preview...",
     "   ",
-    "   GLib.Timeout.add(500, () => {",
+    "   GLib.Timeout.add(100, () => {",
     "   ",
     "   ",
-    "\t   ",
+    "\t    this.notebook.el.set_current_page(1);",
     "\t   ",
     "\t\t  var buf = this.sourceview.el.get_buffer();",
     "\t ",

diff --git a/src/Builder4/GtkView.vala b/src/Builder4/GtkView.vala
index cccf717..7991ac6 100644 (file)
--- a/src/Builder4/GtkView.vala
+++ b/src/Builder4/GtkView.vala
@@ -321,12 +321,12 @@ public class Xcls_GtkView : Object
          
     }
     public void scroll_to_line (int line) {
-       this.notebook.el.page = 1;// code preview...
+      // code preview...
        
-       GLib.Timeout.add(500, () => {
+       GLib.Timeout.add(100, () => {
        
        
-          
+           this.notebook.el.set_current_page(1);
           
                  var buf = this.sourceview.el.get_buffer();
         

diff --git a/src/Builder4/WindowRooView.bjs b/src/Builder4/WindowRooView.bjs
index e066de4..6d9ac28 100644 (file)
--- a/src/Builder4/WindowRooView.bjs
+++ b/src/Builder4/WindowRooView.bjs
@@ -1743,11 +1743,11 @@
    ],
    "| void scroll_to_line" : [
     "(int line) {",
-    "   this.notebook.el.page = 1;// code preview...",
-    "   ",
-    "   GLib.Timeout.add(500, () => {",
+    "   // code preview...",
     "   ",
+    "   GLib.Timeout.add(100, () => {",
     "   ",
+    "\t\tthis.notebook.el.set_current_page( 1 );",
     "\t   ",
     "\t   ",
     "\t\t  var buf = this.sourceview.el.get_buffer();",

diff --git a/src/Builder4/WindowRooView.vala b/src/Builder4/WindowRooView.vala
index dbbf4b9..b567e92 100644 (file)
--- a/src/Builder4/WindowRooView.vala
+++ b/src/Builder4/WindowRooView.vala
@@ -256,11 +256,11 @@ public class Xcls_WindowRooView : Object
          
     }
     public void scroll_to_line (int line) {
-       this.notebook.el.page = 1;// code preview...
-       
-       GLib.Timeout.add(500, () => {
+       // code preview...
        
+       GLib.Timeout.add(100, () => {
        
+               this.notebook.el.set_current_page( 1 );
           
           
                  var buf = this.sourceview.el.get_buffer();

diff --git a/src/Builder4/WindowState.vala b/src/Builder4/WindowState.vala
index 4629069..50cd09e 100644 (file)
--- a/src/Builder4/WindowState.vala
+++ b/src/Builder4/WindowState.vala
@@ -593,11 +593,14 @@ public class WindowState : Object
        public void gotoLine(int line)
        {
        
+               if (line < 0) {
+                       return;
+               }
                if (file.xtype == "PlainFile") {
                    this.switchState (State.CODEONLY); 
-                       if (line> -1) {
-                               this.code_editor_tab.scroll_to_line(line);
-                       }
+                        
+                       this.code_editor_tab.scroll_to_line(line);
+                        
                } else {
                
                        this.switchState (State.PREVIEW); 
@@ -605,9 +608,10 @@ public class WindowState : Object
                        if (file.project.xtype == "Gtk" && line> -1 ) {
                                // fixme - show the editing tab.
                                this.window_gladeview.scroll_to_line(line);
-                       } 
+                       } else {
+                               this.window_rooview.scroll_to_line(line);
                        // fixme - what about Roo?
-
+                       }
                }
        
        }