Rewrite the tree view focus switch (#1949)

novelwriter/guimain.py

@@ -1006,21 +1006,34 @@ class GuiMain(QMainWindow):
     def _switchFocus(self, paneNo: nwFocus) -> None:
         """Switch focus between main GUI views."""
         if paneNo == nwFocus.TREE:
-            if self.projStack.currentWidget() is self.projView:
+            # Decision Matrix
-                if self.projView.treeHasFocus():
+            #  vM | vP | fP | vN | fN | Focus
-                    self._changeView(nwView.NOVEL)
+            # ----|----|----|----|----|---------
-                    self.novelView.setTreeFocus()
+            #  T  | T  | T  | F  | F  | Novel
-                else:
+            #  T  | T  | F  | F  | F  | Project
-                    self.projView.setTreeFocus()
+            #  T  | F  | F  | T  | T  | Project
-            elif self.projStack.currentWidget() is self.novelView:
+            #  T  | F  | F  | T  | F  | Novel
-                if self.novelView.treeHasFocus():
+            #  T  | F  | F  | F  | F  | Project
-                    self._changeView(nwView.PROJECT)
+            #  F  | T  | T  | F  | F  | Project
-                    self.projView.setTreeFocus()
+            #  F  | T  | F  | F  | F  | Project
-                else:
+            #  F  | F  | F  | T  | T  | Novel
-                    self.novelView.setTreeFocus()
+            #  F  | F  | F  | T  | F  | Novel
+            #  F  | F  | F  | F  | F  | Project
+
+            vM = self.mainStack.currentWidget() is self.splitMain
+            vP = self.projStack.currentWidget() is self.projView
+            vN = self.projStack.currentWidget() is self.novelView
+            fP = self.projView.treeHasFocus()
+            fN = self.novelView.treeHasFocus()
+
+            self._changeView(nwView.EDITOR)
+            if (vM and (vP and fP or vN and not fN)) or (not vM and vN):
+                self._changeView(nwView.NOVEL)
+                self.novelView.setTreeFocus()
             else:
                 self._changeView(nwView.PROJECT)
                 self.projView.setTreeFocus()
+
         elif paneNo == nwFocus.DOCUMENT:
             self._changeView(nwView.EDITOR)
             hasViewer = self.splitView.isVisible()
@@ -1030,9 +1043,11 @@ class GuiMain(QMainWindow):
                 self.docEditor.setFocus()
             else:
                 self.docEditor.setFocus()
+
         elif paneNo == nwFocus.OUTLINE:
             self._changeView(nwView.OUTLINE)
             self.outlineView.setTreeFocus()
+
         return
 
     @pyqtSlot(bool, bool, bool, bool)