diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-01-19 12:40:36 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-01-19 12:40:36 (GMT) |
| commit | a9f93437b6b2b9686e1b4f2e691782c6ebe99c26 (patch) | |
| tree | 73954c82fd10611ace85b0bd53f2fb1caad53c72 /src/memberdef.cpp | |
| parent | 9214d84a513a34f9e6137ee779c528504790e58d (diff) | |
| download | Doxygen-a9f93437b6b2b9686e1b4f2e691782c6ebe99c26.zip Doxygen-a9f93437b6b2b9686e1b4f2e691782c6ebe99c26.tar.gz Doxygen-a9f93437b6b2b9686e1b4f2e691782c6ebe99c26.tar.bz2 | |
Fixed issues with SEPARATE_MEMBER_PAGES and INLINE_SIMPLE_STRUCTS
Diffstat (limited to 'src/memberdef.cpp')
| -rw-r--r-- | src/memberdef.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index f26e453..6b890c1 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -979,7 +979,7 @@ QCString MemberDef::getOutputFileBase() const ); return "dummy"; } - else if (separateMemberPages) + else if (separateMemberPages && isDetailedSectionLinkable()) { if (getEnumScope()) // enum value, which is part of enum's documentation { @@ -1791,11 +1791,12 @@ void MemberDef::writeDeclaration(OutputList &ol, ol.writeDoc(rootNode,getOuterScope()?getOuterScope():d,this); if (detailsVisible) { + static bool separateMemberPages = Config_getBool("SEPARATE_MEMBER_PAGES"); ol.pushGeneratorState(); ol.disableAllBut(OutputGenerator::Html); //ol.endEmphasis(); ol.docify(" "); - if (m_impl->group!=0 && gd==0) // forward link to the group + if (separateMemberPages || (m_impl->group!=0 && gd==0)) // forward link to the page or group { ol.startTextLink(getOutputFileBase(),anchor()); } @@ -1899,7 +1900,7 @@ bool MemberDef::isDetailedSectionVisible(bool inGroup,bool inFile) const static bool hideUndocMembers = Config_getBool("HIDE_UNDOC_MEMBERS"); bool groupFilter = getGroupDef()==0 || inGroup || separateMemPages; bool fileFilter = getNamespaceDef()==0 || !inFile; - bool simpleFilter = !hideUndocMembers && inlineSimpleStructs && + bool simpleFilter = (hasBriefDescription() || !hideUndocMembers) && inlineSimpleStructs && getClassDef()!=0 && getClassDef()->isSimple(); bool visible = isDetailedSectionLinkable() && groupFilter && fileFilter && @@ -2317,7 +2318,7 @@ void MemberDef::_writeEnumValues(OutputList &ol,Definition *container, Doxygen::indexList->addIndexItem(container,fmd); //ol.writeListItem(); - ol.startDescTableTitle(); // this enables emphasis! + ol.startDescTableTitle(); ol.startDoxyAnchor(cfname,cname,fmd->anchor(),fmd->name(),fmd->argsString()); first=FALSE; //ol.startEmphasis(); |