Fix focus switch on close tab

qgis · Mar 3, 2023 · 43c415d · 43c415d
1 parent fc3847d
commit 43c415d
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/python/console/console_editor.py b/python/console/console_editor.py
@@ -767,20 +767,7 @@ def _removeTab(self, tab, tab2index=False):
                 self.removeTab(tab)
 
         editorTab.deleteLater()
-        self.currentWidget().setFocus(Qt.TabFocusReason)
-
-    def buttonClosePressed(self):
-        self.closeCurrentWidget()
-
-    def closeCurrentWidget(self):
-        currWidget = self.currentWidget()
-        if currWidget and currWidget.close():
-            self.removeTab(self.currentIndex())
-            currWidget = self.currentWidget()
-            if currWidget:
-                currWidget.setFocus(Qt.TabFocusReason)
-        if currWidget.path in self.restoreTabList:
-            self.parent.updateTabListScript(currWidget.path, action='remove')
+        self.currentWidget()._editor.setFocus(Qt.TabFocusReason)
 
     def restoreTabsOrAddNew(self):
         """
@@ -812,7 +799,7 @@ def restoreTabs(self):
             self.newTabEditor(filename=None)
         self.topFrame.close()
         self.enableToolBarEditor(True)
-        self.currentWidget().setFocus(Qt.TabFocusReason)
+        self.currentWidget()._editor.setFocus(Qt.TabFocusReason)
 
     def closeRestore(self):
         self.parent.updateTabListScript(None)