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

sessions: Store zoom/scroll-pos per history entry.

Browse Source 
Also fixes #728.
This commit is contained in:
Florian Bruhin 2015-06-27 18:06:18 +02:00
parent 58b738ca5b
commit b3869fe42b
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
qutebrowser/misc/sessions.py
View File

@ -145,21 +145,23 @@ class SessionManager(QObject):
if item.originalUrl() != item.url(): if item.originalUrl() != item.url():
encoded = item.originalUrl().toEncoded() encoded = item.originalUrl().toEncoded()
item_data['original-url'] = bytes(encoded).decode('ascii') item_data['original-url'] = bytes(encoded).decode('ascii')
user_data = item.userData()
if history.currentItemIndex() == idx: if history.currentItemIndex() == idx:
item_data['active'] = True item_data['active'] = True
if user_data is None:
pos = tab.page().mainFrame().scrollPosition()
data['zoom'] = tab.zoomFactor()
data['scroll-pos'] = {'x': pos.x(), 'y': pos.y()}
data['history'].append(item_data)
if user_data is not None: user_data = item.userData()
if history.currentItemIndex() == idx:
pos = tab.page().mainFrame().scrollPosition()
item_data['zoom'] = tab.zoomFactor()
item_data['scroll-pos'] = {'x': pos.x(), 'y': pos.y()}
elif user_data is not None:
if 'zoom' in user_data: if 'zoom' in user_data:
data['zoom'] = user_data['zoom'] item_data['zoom'] = user_data['zoom']
if 'scroll-pos' in user_data: if 'scroll-pos' in user_data:
pos = user_data['scroll-pos'] pos = user_data['scroll-pos']
data['scroll-pos'] = {'x': pos.x(), 'y': pos.y()} item_data['scroll-pos'] = {'x': pos.x(), 'y': pos.y()}
data['history'].append(item_data)
return data return data
def _save_all(self): def _save_all(self):
@ -235,11 +237,25 @@ class SessionManager(QObject):
entries = [] entries = []
for histentry in data['history']: for histentry in data['history']:
user_data = {} user_data = {}
if 'zoom' in data: if 'zoom' in data:
# The zoom was accidentally stored in 'data' instead of per-tab
# earlier.
# See https://github.com/The-Compiler/qutebrowser/issues/728
user_data['zoom'] = data['zoom'] user_data['zoom'] = data['zoom']
elif 'zoom' in histentry:
user_data['zoom'] = histentry['zoom']
if 'scroll-pos' in data: if 'scroll-pos' in data:
# The scroll position was accidentally stored in 'data' instead
# of per-tab earlier.
# See https://github.com/The-Compiler/qutebrowser/issues/728
pos = data['scroll-pos'] pos = data['scroll-pos']
user_data['scroll-pos'] = QPoint(pos['x'], pos['y']) user_data['scroll-pos'] = QPoint(pos['x'], pos['y'])
elif 'scroll-pos' in histentry:
pos = histentry['scroll-pos']
user_data['scroll-pos'] = QPoint(pos['x'], pos['y'])
active = histentry.get('active', False) active = histentry.get('active', False)
url = QUrl.fromEncoded(histentry['url'].encode('ascii')) url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
if 'original-url' in histentry: if 'original-url' in histentry: