Skip to content

Commit fc0164e

Browse files
committed
Make SOURCE_TOOLTIPS independent of HTML_DYNAMIC_SECTIONS
Regression in 1.17.0 compared to 1.16.0
1 parent 87e25d0 commit fc0164e

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

src/htmlgen.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,8 @@ static QCString substituteHtmlKeywords(const QCString &file,
324324

325325
QCString projectName = Config_getString(PROJECT_NAME);
326326
bool treeView = Config_getBool(GENERATE_TREEVIEW);
327-
bool dynamicSections = Config_getBool(HTML_DYNAMIC_SECTIONS);
327+
bool dynamicSections = Config_getBool(HTML_DYNAMIC_SECTIONS) ||
328+
(Config_getBool(SOURCE_BROWSER) && Config_getBool(SOURCE_TOOLTIPS));
328329
bool codeFolding = Config_getBool(HTML_CODE_FOLDING);
329330
bool searchEngine = Config_getBool(SEARCHENGINE);
330331
bool serverBasedSearch = Config_getBool(SERVER_BASED_SEARCH);
@@ -1372,13 +1373,17 @@ void HtmlGenerator::init()
13721373
}
13731374
}
13741375

1375-
if (Config_getBool(HTML_DYNAMIC_SECTIONS))
1376+
if (Config_getBool(HTML_DYNAMIC_SECTIONS) ||
1377+
(Config_getBool(SOURCE_BROWSER) && Config_getBool(SOURCE_TOOLTIPS)))
13761378
{
13771379
std::ofstream f = Portable::openOutputStream(dname+"/dynsections.js");
13781380
if (f.is_open())
13791381
{
13801382
TextStream t(&f);
1381-
t << replaceVariables(mgr.getAsString("dynsections.js"));
1383+
if (Config_getBool(HTML_DYNAMIC_SECTIONS))
1384+
{
1385+
t << replaceVariables(mgr.getAsString("dynsections.js"));
1386+
}
13821387
if (Config_getBool(SOURCE_BROWSER) && Config_getBool(SOURCE_TOOLTIPS))
13831388
{
13841389
t << replaceVariables(mgr.getAsString("dynsections_tooltips.js"));
@@ -1770,7 +1775,8 @@ void HtmlGenerator::writeStyleInfo(int part)
17701775

17711776
Doxygen::indexList->addStyleSheetFile("navtree.css");
17721777

1773-
if (Config_getBool(HTML_DYNAMIC_SECTIONS))
1778+
if (Config_getBool(HTML_DYNAMIC_SECTIONS) ||
1779+
(Config_getBool(SOURCE_BROWSER) && Config_getBool(SOURCE_TOOLTIPS)))
17741780
{
17751781
Doxygen::indexList->addStyleSheetFile("dynsections.js");
17761782
}

0 commit comments

Comments
 (0)