diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2015-01-23 19:09:38 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-01-23 19:09:38 (GMT) |
commit | f67f801d897ad368399f03c34b5a6b65764c0a72 (patch) | |
tree | 6f45ef40f8be76bb9ca854dad1ff4388c3688394 | |
parent | 4edd044706e09c51f948365b1eea5b15f18b93e7 (diff) | |
parent | 8c97e0cd63bcf942ee5b43c9471055a4ea27551c (diff) | |
download | Doxygen-f67f801d897ad368399f03c34b5a6b65764c0a72.zip Doxygen-f67f801d897ad368399f03c34b5a6b65764c0a72.tar.gz Doxygen-f67f801d897ad368399f03c34b5a6b65764c0a72.tar.bz2 |
Merge pull request #286 from albert-github/feature/bug_742445
Bug 742445 - Wrong icons in TOC of CHM help
-rw-r--r-- | src/definition.cpp | 6 | ||||
-rw-r--r-- | src/index.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/definition.cpp b/src/definition.cpp index 8014a37..0ef55d4 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -495,7 +495,11 @@ void Definition::addSectionsToIndex() } QCString title = si->title; if (title.isEmpty()) title = si->label; - Doxygen::indexList->addContentsItem(TRUE,title, + // determine if there is a next level inside this item + ++li; + bool isDir = ((li.current()) ? (int)(li.current()->type > nextLevel):FALSE); + --li; + Doxygen::indexList->addContentsItem(isDir,title, getReference(), getOutputFileBase(), si->label, diff --git a/src/index.cpp b/src/index.cpp index 9f7542f..9ded1ab 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -3116,14 +3116,14 @@ static void writePages(PageDef *pd,FTVHelp *ftv) { //printf("*** adding %s\n",pageTitle.data()); ftv->addContentsItem( - hasSubPages,pageTitle, + hasSubPages || hasSections,pageTitle, pd->getReference(),pd->getOutputFileBase(), 0,hasSubPages,TRUE,pd); } if (addToIndex && pd!=Doxygen::mainPage) { Doxygen::indexList->addContentsItem( - hasSubPages,pageTitle, + hasSubPages || hasSections,pageTitle, pd->getReference(),pd->getOutputFileBase(), 0,hasSubPages,TRUE); } |