diff options
author | albert-github <albert.tests@gmail.com> | 2019-02-13 18:12:51 (GMT) |
---|---|---|
committer | albert-github <albert.tests@gmail.com> | 2019-02-13 18:12:51 (GMT) |
commit | a8531bf68065312856f123805f858d60e580a1f4 (patch) | |
tree | aea9164f903323c9467f3aee3843c216130a21b2 | |
parent | 9a05fda1c0aef229252d133987f866e0f6718eb0 (diff) | |
download | Doxygen-a8531bf68065312856f123805f858d60e580a1f4.zip Doxygen-a8531bf68065312856f123805f858d60e580a1f4.tar.gz Doxygen-a8531bf68065312856f123805f858d60e580a1f4.tar.bz2 |
Incorrect layout of class index (HTML)
Regression of #6663
When looking at the example of #4935 the sorting and layout is correct in 1.8.14 but the layout is incorrect in 1.8.15.
The incorrect layout is due to #6663 where a special case was solved for XHTML, the correct procedure should have been that in case of a table row without cells a dummy cell is added.
The changes from #6663 have been reverted and the fix has been corrected (the special case occurred in the doxygen diagrams example).
-rw-r--r-- | src/index.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/index.cpp b/src/index.cpp index 5126255..913f31b 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -2222,6 +2222,7 @@ static void writeAlphabeticalClassList(OutputList &ol, ClassDef::CompoundType ct // the last column may contain less items then the others //int colsInRow = (i<rows-1) ? columns : itemsInLastRow; //printf("row [%d]\n",i); + bool cellCont = false; for (j=0;j<columns;j++) // foreach table column { if (colIterators[j]) @@ -2233,6 +2234,7 @@ static void writeAlphabeticalClassList(OutputList &ol, ClassDef::CompoundType ct { if (cell->letter()!=0) { + cellCont = true; QCString s = letterToLabel(cell->letter()); ol.writeString("<td rowspan=\"2\" valign=\"bottom\">"); ol.writeString("<a name=\"letter_"); @@ -2249,6 +2251,7 @@ static void writeAlphabeticalClassList(OutputList &ol, ClassDef::CompoundType ct } else if (cell->classDef()!=(ClassDef*)0x8) { + cellCont = true; cd = cell->classDef(); ol.writeString("<td valign=\"top\">"); QCString namesp,cname; @@ -2287,20 +2290,21 @@ static void writeAlphabeticalClassList(OutputList &ol, ClassDef::CompoundType ct } ol.writeNonBreakableSpace(3); } - else + ++(*colIterators[j]); + if (cell->letter()!=0 || cell->classDef()!=(ClassDef*)0x8) { - ol.writeString("<td>"); + ol.writeString("</td>\n"); } - ++(*colIterators[j]); - ol.writeString("</td>"); } } else { + cellCont = true; ol.writeString("<td></td>"); } } } + if (!cellCont) ol.writeString("<td></td>"); // we need at least one cell in case of xhtml ol.writeString("</tr>\n"); } ol.writeString("</table>\n"); |