rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-add geometry saving code to WebEngine inspector

Browse Source
This commit is contained in:
Florian Bruhin 2016-08-03 16:29:46 +02:00
parent 61e0c8327a
commit 0ddb27709d
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
qutebrowser/browser/webengine/webengineinspector.py
View File

@ -45,6 +45,8 @@ class WebInspector(QWidget):
"""A web inspector for QtWebEngine which stores its geometry.""" """A web inspector for QtWebEngine which stores its geometry."""
# FIXME:qtwebengine unify this with the WebKit inspector as far as possible
def __init__(self, parent=None): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)
self.port = None self.port = None
@ -52,6 +54,7 @@ class WebInspector(QWidget):
self._layout = miscwidgets.WrapperLayout(self._view, self) self._layout = miscwidgets.WrapperLayout(self._view, self)
self.setFocusProxy(self._view) self.setFocusProxy(self._view)
self._view.setParent(self) self._view.setParent(self)
self._load_state_geometry()
def load(self): def load(self):
envvar = 'QTWEBENGINE_REMOTE_DEBUGGING' envvar = 'QTWEBENGINE_REMOTE_DEBUGGING'
@ -63,29 +66,27 @@ class WebInspector(QWidget):
url = QUrl('http://localhost:{}/'.format(port)) url = QUrl('http://localhost:{}/'.format(port))
self._view.load(url) self._view.load(url)
# self._load_state_geometry() def closeEvent(self, e):
"""Save the geometry when closed."""
state_config = objreg.get('state-config')
data = bytes(self.saveGeometry())
geom = base64.b64encode(data).decode('ASCII')
state_config['geometry']['inspector'] = geom
super().closeEvent(e)
# def closeEvent(self, e): def _load_state_geometry(self):
# """Save the geometry when closed.""" """Load the geometry from the state file."""
# state_config = objreg.get('state-config') state_config = objreg.get('state-config')
# data = bytes(self.saveGeometry()) try:
# geom = base64.b64encode(data).decode('ASCII') data = state_config['geometry']['inspector']
# state_config['geometry']['inspector'] = geom geom = base64.b64decode(data, validate=True)
# super().closeEvent(e) except KeyError:
# First start
# def _load_state_geometry(self): pass
# """Load the geometry from the state file.""" except binascii.Error:
# state_config = objreg.get('state-config') log.misc.exception("Error while reading geometry")
# try: else:
# data = state_config['geometry']['inspector'] log.init.debug("Loading geometry from {}".format(geom))
# geom = base64.b64decode(data, validate=True) ok = self.restoreGeometry(geom)
# except KeyError: if not ok:
# # First start log.init.warning("Error while loading geometry.")
# pass
# except binascii.Error:
# log.misc.exception("Error while reading geometry")
# else:
# log.init.debug("Loading geometry from {}".format(geom))
# ok = self.restoreGeometry(geom)
# if not ok:
# log.init.warning("Error while loading geometry.")