Fixed minor bug in treeview layout when using @subpage inside @mainpage

4 files changed, 31 insertions, 11 deletions

diff --git a/INSTALL b/INSTALL
index 82c2869..77d0127 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,4 +4,4 @@ Please read the installation section of the manual
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (19 May 2012)
+Dimitri van Heesch (20 May 2012)
diff --git a/README b/README
index 6b2b775..66b3b4c 100644
--- a/README
+++ b/README
@@ -26,4 +26,4 @@ forum.
 
 Enjoy,
 
-Dimitri van Heesch (dimitri@stack.nl) (19 May 2012)
+Dimitri van Heesch (dimitri@stack.nl) (20 May 2012)
diff --git a/doc/doxygen_manual.css b/doc/doxygen_manual.css
index c2b0029..644e4d7 100644
--- a/doc/doxygen_manual.css
+++ b/doc/doxygen_manual.css
@@ -237,7 +237,7 @@ body {
 
 div.contents {
 	margin-bottom: 10px;
-	padding: 8px;
+	padding: 12px;
 	margin-left: auto;
 	margin-right: auto;
 	width: 800px;
@@ -861,8 +861,8 @@ div.header
  	margin-left: auto;
  	margin-right: auto;
  	width: 800px;
- 	padding-left: 8px;
- 	padding-right: 8px;
+ 	padding-left: 12px;
+ 	padding-right: 12px;
          /* firefox specific markup */
          -moz-box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 5px;
          /* webkit specific markup */
@@ -881,42 +881,62 @@ dl
 
 dl.section
 {
-        border-left:4px solid;
         padding: 0 0 0 6px;
 }
 
 dl.note
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #D0C000;
 }
 
 dl.warning, dl.attention
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #FF0000;
 }
 
 dl.pre, dl.post, dl.invariant
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #00D000;
 }
 
 dl.deprecated
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #505050;
 }
 
 dl.todo
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #00C0E0;
 }
 
 dl.test
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #3030E0;
 }
 
 dl.bug
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #C08050;
 }
 
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
     {