From e0213e74473a27887e97a73633e5cdfe2d310e09 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Jun 2018 16:28:40 +0200
Subject: [PATCH] Use WrapperLayout instead of PseudoLayout

---
 qutebrowser/browser/webengine/webview.py |  7 +-----
 qutebrowser/misc/miscwidgets.py          | 29 ++++++++----------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py
index f597e960c..5652257fb 100644
--- a/qutebrowser/browser/webengine/webview.py
+++ b/qutebrowser/browser/webengine/webview.py
@@ -54,16 +54,11 @@ class WebEngineView(QWebEngineView):
         self.setPage(page)
 
         sip.delete(self.layout())
-        self._layout = miscwidgets.PseudoLayout(self)
+        self._layout = miscwidgets.WrapperLayout(self)
 
     def shutdown(self):
         self.page().shutdown()
 
-    def resizeEvent(self, _event):
-        proxy = self.focusProxy()
-        if proxy:
-            proxy.setGeometry(self.rect())
-
     def createWindow(self, wintype):
         """Called by Qt when a page wants to create a new window.
 
diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py
index 908ea6235..f1d5e8f73 100644
--- a/qutebrowser/misc/miscwidgets.py
+++ b/qutebrowser/misc/miscwidgets.py
@@ -240,8 +240,13 @@ class WrapperLayout(QLayout):
         super().__init__(parent)
         self._widget = None
 
-    def addItem(self, _widget):
-        raise utils.Unreachable
+    def addItem(self, item):
+        assert self.parent() is not None
+        self.wrap(self.parent(), item.widget())
+
+    def removeItem(self, item):
+        assert item.widget() == self._widget
+        self.unwrap()
 
     def sizeHint(self):
         return self._widget.sizeHint()
@@ -253,7 +258,8 @@ class WrapperLayout(QLayout):
         raise utils.Unreachable
 
     def setGeometry(self, rect):
-        self._widget.setGeometry(rect)
+        if self._widget is not None:
+            self._widget.setGeometry(rect)
 
     def wrap(self, container, widget):
         """Wrap the given widget in the given container."""
@@ -264,22 +270,7 @@ class WrapperLayout(QLayout):
     def unwrap(self):
         self._widget.setParent(None)
         self._widget.deleteLater()
-
-
-class PseudoLayout(QLayout):
-
-    def addItem(self, item):
-        assert self.parent() is not None
-        item.widget().setParent(self.parent())
-
-    def removeItem(self, item):
-        item.widget().setParent(None)
-
-    def count(self):
-        return 0
-
-    def itemAt(self, _pos):
-        return None
+        self._widget = None
 
 
 class FullscreenNotification(QLabel):