Mercurial Repositories > eric / file diff

--- a/src/eric7/QScintilla/EditorAssembly.py	Mon Dec 05 15:08:18 2022 +0100
+++ b/src/eric7/QScintilla/EditorAssembly.py	Mon Dec 05 16:11:34 2022 +0100
@@ -53,6 +53,7 @@
         self.__layout.setContentsMargins(0, 0, 0, 0)
         self.__layout.setSpacing(1)
 
+        self.__showNavigator = Preferences.getEditor("ShowSourceNavigator")
         self.__showOutline = Preferences.getEditor("ShowSourceOutline")
 
         self.__editor = Editor(dbs, fn, vm, filetype, editor, tv)
@@ -90,8 +91,8 @@
         self.__globalsBoundaries = {}
         self.__membersBoundaries = {}
 
-        self.__activateOutline(self.__showOutline)
-        self.__activateCombos(not self.__showOutline)
+        self.__activateOutline(self.__showNavigator and self.__showOutline)
+        self.__activateCombos(self.__showNavigator and not self.__showOutline)
 
         ericApp().getObject("UserInterface").preferencesChanged.connect(
             self.__preferencesChanged
@@ -120,11 +121,13 @@
         """
         Private slot handling a change of preferences.
         """
+        showNavigator = Preferences.getEditor("ShowSourceNavigator")
         showOutline = Preferences.getEditor("ShowSourceOutline")
-        if showOutline != self.__showOutline:
+        if showOutline != self.__showOutline or showNavigator != self.__showNavigator:
             self.__showOutline = showOutline
-            self.__activateOutline(self.__showOutline)
-            self.__activateCombos(not self.__showOutline)
+            self.__showNavigator = showNavigator
+            self.__activateOutline(self.__showNavigator and self.__showOutline)
+            self.__activateCombos(self.__showNavigator and not self.__showOutline)
 
     #######################################################################
     ## Methods dealing with the navigation combos below