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

Merge remote-tracking branch 'origin/pr/3587'

Browse Source
This commit is contained in:
Florian Bruhin 2018-02-12 15:31:45 +01:00
commit c736cdf87f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qutebrowser/browser/webengine/webenginetab.py
View File

@ -490,13 +490,18 @@ class WebEngineHistory(browsertab.AbstractHistory):
def load_items(self, items):
stream, _data, cur_data = tabhistory.serialize(items)
qtutils.deserialize_stream(stream, self._history)
@pyqtSlot()
def _on_load_finished():
self._tab.scroller.to_point(cur_data['scroll-pos'])
self._tab.load_finished.disconnect(_on_load_finished)
if cur_data is not None:
if 'zoom' in cur_data:
self._tab.zoom.set_factor(cur_data['zoom'])
if ('scroll-pos' in cur_data and
self._tab.scroller.pos_px() == QPoint(0, 0)):
self._tab.get_page().loadFinished.connect(functools.partial(
self._tab.scroller.to_point, cur_data['scroll-pos']))
self._tab.load_finished.connect(_on_load_finished)
class WebEngineZoom(browsertab.AbstractZoom):
@ -643,9 +648,6 @@ class WebEngineTab(browsertab.AbstractTab):
self.zoom.set_factor(self._saved_zoom)
self._saved_zoom = None
def get_page(self):
return self._widget.page()
def openurl(self, url):
self._saved_zoom = self.zoom.factor()
self._openurl_prepare(url)