Use zoom factor instead of text size multiplier in helpviewer_qwv.cpp.

Task-number: QTCREATORBUG-7199

Change-Id: Iaad133b5dd729b2f9dc141b13162213cd6a41f49
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
This commit is contained in:
Michael Brüning
2012-11-07 16:53:00 +01:00
committed by Karsten Heimrich
parent ab7ef16030
commit 84a625248f

View File

@@ -350,7 +350,7 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent)
connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested())); connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested()));
setViewerFont(viewerFont()); setViewerFont(viewerFont());
setTextSizeMultiplier(zoom == 0.0 ? 1.0 : zoom); setZoomFactor(zoom == 0.0 ? 1.0 : zoom);
} }
HelpViewer::~HelpViewer() HelpViewer::~HelpViewer()
@@ -376,22 +376,22 @@ void HelpViewer::setViewerFont(const QFont &font)
void HelpViewer::scaleUp() void HelpViewer::scaleUp()
{ {
setTextSizeMultiplier(textSizeMultiplier() + 0.1); setZoomFactor(zoomFactor() + 0.1);
} }
void HelpViewer::scaleDown() void HelpViewer::scaleDown()
{ {
setTextSizeMultiplier(qMax(qreal(0.0), textSizeMultiplier() - qreal(0.1))); setZoomFactor(qMax(qreal(0.0), zoomFactor() - qreal(0.1)));
} }
void HelpViewer::resetScale() void HelpViewer::resetScale()
{ {
setTextSizeMultiplier(1.0); setZoomFactor(1.0);
} }
qreal HelpViewer::scale() const qreal HelpViewer::scale() const
{ {
return textSizeMultiplier(); return zoomFactor();
} }
QString HelpViewer::title() const QString HelpViewer::title() const