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

Fix jumping to an anchor once the page has been scrolled.

Browse Source 
Task-number: QTCREATORBUG-2130
(cherry picked from commit 9e352be3b1)
This commit is contained in:
kh1
2010-08-23 14:30:29 +02:00
committed by hjk
parent 7dfcbe5f39
commit 3e06ffd0c9
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/help/helpplugin.cpp
View File

@@ -719,16 +719,20 @@ void HelpPlugin::activateContext()
viewer->stop(); viewer->stop();
#endif #endif
viewer->setSource(source); viewer->setSource(source);
} connect(viewer, SIGNAL(loadFinished(bool)), this,
viewer->setFocus(); SLOT(highlightSearchTerms()));
connect(viewer, SIGNAL(loadFinished(bool)), this,
SLOT(highlightSearchTerms()));
if (source.toString().remove(source.fragment()) if (source.toString().remove(source.fragment())
== oldSource.toString().remove(oldSource.fragment())) { == oldSource.toString().remove(oldSource.fragment())) {
highlightSearchTerms(); highlightSearchTerms();
}
} else {
#if !defined(QT_NO_WEBKIT)
viewer->page()->mainFrame()->scrollToAnchor(source.fragment());
#endif
} }
} }
viewer->setFocus();
} }
} }
@@ -866,7 +870,7 @@ void HelpPlugin::highlightSearchTerms()
if (attrValue == name || name.startsWith(attrValue + QLatin1Char('-'))) { if (attrValue == name || name.startsWith(attrValue + QLatin1Char('-'))) {
QWebElement parent = element.parent(); QWebElement parent = element.parent();
m_styleProperty = parent.styleProperty(property, m_styleProperty = parent.styleProperty(property,
QWebElement::InlineStyle); QWebElement::ComputedStyle);
parent.setStyleProperty(property, QLatin1String("yellow")); parent.setStyleProperty(property, QLatin1String("yellow"));
} }
} }