Merge lp:~gero-bare/scratch/fix-1392031-again into lp:~elementary-apps/scratch/scratch

[Gero.Bare]

Ok things to be tested.

> Open files using the file manager plugin.
> Open new SplitView, make sure that:
  * new tabs (Ctrl-n) are opened in the right split view.
  * files opened with the filemanager are opened in the right view.
  * switch focus between views and test the same conditions.

etc.

Additional notes. Sometimes a view is closed and when reopened it opens all the previously opened files but sometimes not. I don't know if intended or not, I wont fix.
I found that opening files with folder icon, can sometimes open the same file twice in the same splitview, I couldn't reproduce reliably plus I found it in the middle of the iteration so be warned, but I don't think that it's entirely my fault. But I won't fix.

[Danielle Foré (danrabbit)]

Please make sure this doesn't break the folder sidebar

review: Needs Fixing

[Danielle Foré (danrabbit)]

With this change, opening files from the folder sidebar often does not work. It seems like it's maybe trying to open the file in the closed pane instead of the opened one.

Unmerged revisions

1831. By Gero.Bare on 2017-03-04

      * Fixed bug 1392031 again

      * Removed calls to split_view.get_focus_child (), use get_current_view () instead.

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2017-01-06 17:11:40 +0000
+++ src/MainWindow.vala	2017-03-04 05:29:54 +0000
@@ -479,11 +479,7 @@
                 view.open_document (doc);
             } else {
                 if (view == null) {
-                    view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
-                }
-
-                if (view == null) {
-                    view = this.split_view.current_view;
+                    view = this.split_view.get_current_view ();
                 }
 
                 view.open_document (doc);
@@ -497,10 +493,7 @@
                 view = split_view.add_view ();
                 view.close_document (doc);
             } else {
-                view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
-                if (view == null) {
-                    view = this.split_view.current_view;
-                }
+                view = split_view.get_current_view ();
 
                 view.close_document (doc);
             }
@@ -762,7 +755,7 @@
             if (this.split_view.is_empty ()) {
                 view = split_view.add_view ();
             } else {
-                view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
+                view = split_view.get_current_view ();
             }
 
             view.new_document ();
@@ -773,7 +766,7 @@
             if (this.split_view.is_empty ()) {
                 view = split_view.add_view ();
             } else {
-                view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
+                view = split_view.get_current_view ();
             }
 
             string text_from_clipboard = clipboard.wait_for_text ();
@@ -859,19 +852,19 @@
 
         private void action_next_tab () {
             Scratch.Widgets.DocumentView? view = null;
-            view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
+            view = split_view.get_current_view ();
             view.next_document ();
         }
 
         private void action_previous_tab () {
             Scratch.Widgets.DocumentView? view = null;
-            view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
+            view = split_view.get_current_view ();
             view.previous_document ();
         }
 
         private void action_to_lower_case () {
             Scratch.Widgets.DocumentView? view = null;
-            view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
+            view = split_view.get_current_view ();
             var doc = view.get_current_document ();
             if (doc == null) {
                 return;
@@ -888,7 +881,7 @@
 
         private void action_to_upper_case () {
             Scratch.Widgets.DocumentView? view = null;
-            view = split_view.get_focus_child () as Scratch.Widgets.DocumentView;
+            view = split_view.get_current_view ();
             var doc = view.get_current_document ();
             if (doc == null) {
                 return;

=== modified file 'src/Widgets/SplitView.vala'
--- src/Widgets/SplitView.vala	2017-02-17 17:07:43 +0000
+++ src/Widgets/SplitView.vala	2017-03-04 05:29:54 +0000
@@ -24,7 +24,7 @@
 
         // Widgets
         public Granite.Widgets.Welcome welcome_screen;
-        public Scratch.Widgets.DocumentView? current_view = null;
+        private Scratch.Widgets.DocumentView? current_view = null;
 
         public GLib.List<Scratch.Widgets.DocumentView> views;
         private GLib.List<Scratch.Widgets.DocumentView> hidden_views;
@@ -133,12 +133,14 @@
         public void remove_view (Scratch.Widgets.DocumentView? view = null) {
             // If no specific view is required to be removed, just remove the current one
             if (view == null)
-                view = get_focus_child () as Scratch.Widgets.DocumentView;
+                view = current_view;
             if (view == null) {
                 warning ("There is no focused view to remove!");
                 return;
             }
 
+            view.save_opened_files ();
+
             foreach (var doc in view.docs) {
                 if (!doc.close (true)) {
                     view.set_current_document (doc);
@@ -155,9 +157,6 @@
 
                 view.view_id = 2;
                 right_view.view_id = 1;
-
-                view.save_opened_files ();
-                right_view.save_opened_files ();
             } else {
                 remove (view);
             }
@@ -177,16 +176,20 @@
             }
 
             // Show/Hide welcome screen
-            if (this.views.length () == 0)
+            if (this.views.length () == 0) {
+                current_view = null;
                 show_welcome ();
+            } else {
+                current_view = get_child1 () as Scratch.Widgets.DocumentView;
+            }
+
         }
 
         public Scratch.Widgets.DocumentView? get_current_view () {
-            views.foreach ((v) => {
-                if (v.has_focus) {
-                    current_view = v;
-                }
-            });
+            Scratch.Widgets.DocumentView _current_view = get_focus_child () as Scratch.Widgets.DocumentView;
+            if (_current_view != null) {
+                current_view = _current_view;
+            }
             return current_view;
         }