diff -r 93732395fc1d -r c9982bcd00f8 Helpviewer/HelpBrowserWV.py
--- a/Helpviewer/HelpBrowserWV.py Sun Dec 06 14:54:10 2015 +0100
+++ b/Helpviewer/HelpBrowserWV.py Sun Dec 06 19:09:32 2015 +0100
@@ -686,7 +686,8 @@
return
if 'zoom' in data:
- frame.page().view().setZoomValue(int(data['zoom'] * 100))
+ frame.page().view().setZoomValue(int(data['zoom'] * 100),
+ saveValue=False)
if 'scrollPos' in data and frame.scrollPosition() == QPoint(0, 0):
frame.setScrollPosition(data['scrollPos'])
@@ -1056,17 +1057,24 @@
"""
self.setZoomValue(self.__currentZoom)
- def setZoomValue(self, value):
+ def setZoomValue(self, value, saveValue=True):
"""
Public method to set the zoom value.
@param value zoom value (integer)
+ @keyparam saveValue flag indicating to save the zoom value with the
+ zoom manager
+ @type bool
"""
if value != self.zoomValue():
try:
self.setZoomFactor(value / 100.0)
except AttributeError:
self.setTextSizeMultiplier(value / 100.0)
+ self.__currentZoom = value
+ if saveValue:
+ Helpviewer.HelpWindow.HelpWindow.zoomManager().setZoomValue(
+ self.url(), value)
self.zoomValueChanged.emit(value)
def zoomValue(self):
@@ -1998,6 +2006,10 @@
self.zoomIn()
self.zoomOut()
+ zoomValue = Helpviewer.HelpWindow.HelpWindow.zoomManager()\
+ .zoomValue(self.url())
+ self.setZoomValue(zoomValue)
+
if ok:
self.mw.adBlockManager().page().hideBlockedPageEntries(self.page())
self.mw.passwordManager().fill(self.page())
