From 8c97e0cd63bcf942ee5b43c9471055a4ea27551c Mon Sep 17 00:00:00 2001 From: albert-github Date: Tue, 6 Jan 2015 21:03:38 +0100 Subject: Bug 742445 - Wrong icons in TOC of CHM help It was not checked if a page / section had subsections or not it was always assumed they were present (definition.cpp). For pages it was only checked if it had subpages and not section (index.cpp). --- src/definition.cpp | 6 +++++- 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); } -- cgit v0.12