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

24
src/plugins/help/textbrowserhelpviewer.cpp
View File

@@ -50,9 +50,9 @@ using namespace Help::Internal;
// -- HelpViewer
TextBrowserHelpViewer::TextBrowserHelpViewer(qreal zoom, QWidget *parent)
TextBrowserHelpViewer::TextBrowserHelpViewer(QWidget *parent)
: HelpViewer(parent)
, m_textBrowser(new TextBrowserHelpWidget(zoom, this))
, m_textBrowser(new TextBrowserHelpWidget(this))
{
QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout);
@@ -112,6 +112,22 @@ qreal TextBrowserHelpViewer::scale() const
return m_textBrowser->zoomCount;
}
void TextBrowserHelpViewer::setScale(qreal scale)
{
m_textBrowser->forceFont = true;
if (scale > 10)
scale = 10;
else if (scale < -5)
scale = -5;
int diff = (int)scale - m_textBrowser->zoomCount;
if (diff > 0)
m_textBrowser->zoomIn(diff);
else if (diff < 0)
m_textBrowser->zoomOut(-diff);
m_textBrowser->zoomCount = (int)scale;
m_textBrowser->forceFont = false;
}
QString TextBrowserHelpViewer::title() const
{
return m_textBrowser->documentTitle();
@@ -284,9 +300,9 @@ void TextBrowserHelpViewer::goToHistoryItem()
// -- private
TextBrowserHelpWidget::TextBrowserHelpWidget(int zoom, TextBrowserHelpViewer *parent)
TextBrowserHelpWidget::TextBrowserHelpWidget(TextBrowserHelpViewer *parent)
: QTextBrowser(parent)
, zoomCount(zoom)
, zoomCount(0)
, forceFont(false)
, m_openInNewPageActionVisible(true)
, m_parent(parent)