aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/help/macwebkithelpviewer.mm
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2014-12-18 11:36:49 +0100
committerEike Ziller <eike.ziller@theqtcompany.com>2014-12-19 10:40:50 +0100
commitee6359418281c9fab5edb8d5ce9210e5b51f776e (patch)
tree70808987b207e0e6db369c1987c1494667d89911 /src/plugins/help/macwebkithelpviewer.mm
parent6cafc424e837aa64ecfad3828fb840d08b747452 (diff)
Help: Do not pass zoom factor to constructor
Introduce HelpViewer::setScale instead Change-Id: I9d50483bc1fa4de89de53db40eda348379bd0ae9 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/help/macwebkithelpviewer.mm')
-rw-r--r--src/plugins/help/macwebkithelpviewer.mm10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/help/macwebkithelpviewer.mm b/src/plugins/help/macwebkithelpviewer.mm
index 7f583f145d2..3c35e49b3a2 100644
--- a/src/plugins/help/macwebkithelpviewer.mm
+++ b/src/plugins/help/macwebkithelpviewer.mm
@@ -454,7 +454,7 @@ void MacWebKitHelpWidget::showEvent(QShowEvent *)
// #pragma mark -- MacWebKitHelpViewer
-MacWebKitHelpViewer::MacWebKitHelpViewer(qreal zoom, QWidget *parent)
+MacWebKitHelpViewer::MacWebKitHelpViewer(QWidget *parent)
: HelpViewer(parent),
m_widget(new MacWebKitHelpWidget(this))
{
@@ -469,7 +469,6 @@ MacWebKitHelpViewer::MacWebKitHelpViewer(qreal zoom, QWidget *parent)
setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(m_widget, 10);
- m_widget->webView().textSizeMultiplier = (zoom == 0.0 ? 1.0 : zoom);
}
MacWebKitHelpViewer::~MacWebKitHelpViewer()
@@ -515,7 +514,12 @@ void MacWebKitHelpViewer::resetScale()
qreal MacWebKitHelpViewer::scale() const
{
AutoreleasePool pool; Q_UNUSED(pool)
- return m_widget->webView().textSizeMultiplier;
+ return m_widget->webView().textSizeMultiplier;
+}
+
+void MacWebKitHelpViewer::setScale(qreal scale)
+{
+ m_widget->webView().textSizeMultiplier = (scale <= 0.0 ? 1.0 : scale);
}
QString MacWebKitHelpViewer::title() const