summaryrefslogtreecommitdiffstats
path: root/src/index.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2012-05-19 22:12:04 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2012-05-19 22:12:04 (GMT)
commit98849cac48159a733a1b3c3ab1466f72a96f216a (patch)
tree85ab7949aa90065fde286a94d6b1a2d303ef83dd /src/index.cpp
parent55e5055cfbb6f8e013a894c0ec8b10771231e3ba (diff)
downloadDoxygen-98849cac48159a733a1b3c3ab1466f72a96f216a.zip
Doxygen-98849cac48159a733a1b3c3ab1466f72a96f216a.tar.gz
Doxygen-98849cac48159a733a1b3c3ab1466f72a96f216a.tar.bz2
Fixed minor bug in treeview layout when using @subpage inside @mainpage
Diffstat (limited to 'src/index.cpp')
-rw-r--r--src/index.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/index.cpp b/src/index.cpp
index 69baca9..30a1ab0 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -3144,7 +3144,7 @@ static void countRelatedPages(int &docPages,int &indexPages)
static void writePages(PageDef *pd,FTVHelp *ftv)
{
- //printf("writePages()=%s\n",pd->title().data());
+ //printf("writePages()=%s pd=%p mainpage=%p\n",pd->name().data(),pd,Doxygen::mainPage);
LayoutNavEntry *lne = LayoutDocManager::instance().rootNavEntry()->find(LayoutNavEntry::Pages);
bool addToIndex = lne==0 || lne->visible();
if (!addToIndex) return;
@@ -3169,7 +3169,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv)
pd->getReference(),pd->getOutputFileBase(),
0,hasSubPages,TRUE,pd);
}
- if (addToIndex)
+ if (addToIndex && pd!=Doxygen::mainPage)
{
Doxygen::indexList.addContentsItem(
hasSubPages,pageTitle,
@@ -3178,7 +3178,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv)
}
}
if (hasSubPages && ftv) ftv->incContentsDepth();
- if (hasSections || hasSubPages)
+ if ((hasSections || hasSubPages) && pd!=Doxygen::mainPage)
{
Doxygen::indexList.incContentsDepth();
}
@@ -3197,7 +3197,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv)
}
}
if (hasSubPages && ftv) ftv->decContentsDepth();
- if (hasSections || hasSubPages)
+ if ((hasSections || hasSubPages) && pd!=Doxygen::mainPage)
{
Doxygen::indexList.decContentsDepth();
}
@@ -3806,7 +3806,7 @@ static void writeIndex(OutputList &ol)
if (Doxygen::mainPage)
{
- if (Doxygen::mainPage->hasSubPages() ||
+ if (/*Doxygen::mainPage->hasSubPages() || */
(!Config_getString("PROJECT_NAME").isEmpty() && mainPageHasTitle())
) // to avoid duplicate entries in the treeview
{