From ce698cfab17aaa59512d78bad8c91bdbb836c00c Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 31 Dec 2023 14:09:10 +1300 Subject: Remove unneeded layout.unwrap() calls We shouldn't really be closing tabs in multiple places[^1], but while we are, lets not promulgate copypasta we don't need. layout.unwrap() was previously called as a workaround for some upstream behaviour in Qt < 5.12. That workaround was removed in c067a96f79fd56e9 [^1]: I want to make it so nodes know how to close tabs, that we we only have to worry about either widget stuff or tree stuff, not both --- qutebrowser/browser/commands.py | 1 - qutebrowser/mainwindow/treetabbedbrowser.py | 1 - 2 files changed, 2 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index caba596c3..d451617dc 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -289,7 +289,6 @@ class CommandDispatcher: tab = descendent.value tab.private_api.shutdown() tab.deleteLater() - tab.layout().unwrap() else: # this also applied to closing collapsed tabs # logic for that is in TreeTabbedBrowser diff --git a/qutebrowser/mainwindow/treetabbedbrowser.py b/qutebrowser/mainwindow/treetabbedbrowser.py index 2fe6d4c84..929188440 100644 --- a/qutebrowser/mainwindow/treetabbedbrowser.py +++ b/qutebrowser/mainwindow/treetabbedbrowser.py @@ -101,7 +101,6 @@ class TreeTabbedBrowser(TabbedBrowser): descendent_tab = descendent.value descendent_tab.private_api.shutdown() descendent_tab.deleteLater() - descendent_tab.layout().unwrap() elif parent: siblings = list(parent.children) children = node.children -- cgit v1.2.3-54-g00ecf