Handle showing/hiding of the inspector properly

This commit is contained in:
Florian Bruhin 2018-06-11 10:52:24 +02:00
parent 1ba2e3e24b
commit f034abe6a1
3 changed files with 10 additions and 5 deletions

View File

@ -87,6 +87,8 @@ class AbstractWebInspector(QWidget):
data = bytes(self.saveGeometry())
geom = base64.b64encode(data).decode('ASCII')
configfiles.state['geometry']['inspector'] = geom
self.inspect(None)
super().closeEvent(e)
def inspect(self, page):
@ -99,3 +101,4 @@ class AbstractWebInspector(QWidget):
self.hide()
else:
self.inspect(page)
self.show()

View File

@ -39,7 +39,7 @@ class WebEngineInspector(inspector.AbstractWebInspector):
settings.setAttribute(QWebEngineSettings.JavascriptEnabled, True)
self._set_widget(view)
def _inspect_old(self):
def _inspect_old(self, page):
"""Set up the inspector for Qt < 5.11."""
try:
port = int(os.environ['QTWEBENGINE_REMOTE_DEBUGGING'])
@ -48,7 +48,11 @@ class WebEngineInspector(inspector.AbstractWebInspector):
"QtWebEngine inspector is not enabled. See "
"'qutebrowser --help' for details.")
url = QUrl('http://localhost:{}/'.format(port))
self._widget.load(url)
if page is None:
self._widget.load(QUrl('about:blank'))
else:
self._widget.load(url)
def _inspect_new(self, page):
"""Set up the inspector for Qt >= 5.11."""
@ -58,5 +62,4 @@ class WebEngineInspector(inspector.AbstractWebInspector):
try:
self._inspect_new(page)
except AttributeError:
self._inspect_old()
self.show()
self._inspect_old(page)

View File

@ -41,4 +41,3 @@ class WebKitInspector(inspector.AbstractWebInspector):
"Please enable content.developer_extras before using the "
"webinspector!")
self._widget.setPage(page)
self.show()