feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Do not pass zoom factor to constructor

Browse Source 
Introduce HelpViewer::setScale instead

Change-Id: I9d50483bc1fa4de89de53db40eda348379bd0ae9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Eike Ziller
2014-12-18 11:36:49 +01:00
parent 6cafc424e8
commit ee63594182
8 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/help/qtwebkithelpviewer.cpp
View File

@@ -250,7 +250,7 @@ void HelpPage::onHandleUnsupportedContent(QNetworkReply *reply)
// -- HelpViewer
QtWebKitHelpWidget::QtWebKitHelpWidget(qreal zoom, QtWebKitHelpViewer *parent)
QtWebKitHelpWidget::QtWebKitHelpWidget(QtWebKitHelpViewer *parent)
: QWebView(parent),
m_parent(parent)
{
@@ -278,8 +278,6 @@ QtWebKitHelpWidget::QtWebKitHelpWidget(qreal zoom, QtWebKitHelpViewer *parent)
SLOT(actionChanged()));
connect(pageAction(QWebPage::Forward), SIGNAL(changed()), this,
SLOT(actionChanged()));
setZoomFactor(zoom == 0.0 ? 1.0 : zoom);
}
QtWebKitHelpWidget::~QtWebKitHelpWidget()
@@ -393,9 +391,9 @@ bool QtWebKitHelpWidget::eventFilter(QObject *obj, QEvent *event)
return QWebView::eventFilter(obj, event);
}
QtWebKitHelpViewer::QtWebKitHelpViewer(qreal zoom, QWidget *parent)
QtWebKitHelpViewer::QtWebKitHelpViewer(QWidget *parent)
: HelpViewer(parent),
m_webView(new QtWebKitHelpWidget(zoom, this))
m_webView(new QtWebKitHelpWidget(this))
{
QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout);
@@ -449,6 +447,11 @@ qreal QtWebKitHelpViewer::scale() const
return m_webView->zoomFactor();
}
void QtWebKitHelpViewer::setScale(qreal scale)
{
m_webView->setZoomFactor(scale <= 0.0 ? 1.0 : scale);
}
QString QtWebKitHelpViewer::title() const
{
return m_webView->title();