diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2020-02-27 21:46:40 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-27 21:46:40 (GMT) |
commit | cee1aaf16ee2389e23d625c12aa43e8154877df9 (patch) | |
tree | 20d68585cf7ec721e99ba1cab39b89fe456d3855 | |
parent | 801e41034b82d7725aac6c95dd0c93b66ec0342c (diff) | |
parent | 8a7647bd12f383730c886b34c431ae976ec5ff83 (diff) | |
download | Doxygen-cee1aaf16ee2389e23d625c12aa43e8154877df9.zip Doxygen-cee1aaf16ee2389e23d625c12aa43e8154877df9.tar.gz Doxygen-cee1aaf16ee2389e23d625c12aa43e8154877df9.tar.bz2 |
Merge pull request #7612 from albert-github/feature/issue_7583
issue #7583 External Links in Inheritance Diagrams open in the Image Frame.
-rw-r--r-- | src/diagram.cpp | 2 | ||||
-rw-r--r-- | src/dotfilepatcher.cpp | 2 | ||||
-rw-r--r-- | src/util.cpp | 9 | ||||
-rw-r--r-- | src/util.h | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/src/diagram.cpp b/src/diagram.cpp index 18817e9..25b2c06 100644 --- a/src/diagram.cpp +++ b/src/diagram.cpp @@ -261,7 +261,7 @@ static void writeMapArea(FTextStream &t,const ClassDef *cd,QCString relPath, t << "<area "; if (!ref.isEmpty()) { - t << externalLinkTarget(); + t << externalLinkTarget(true); } t << "href=\""; t << externalRef(relPath,ref,TRUE); diff --git a/src/dotfilepatcher.cpp b/src/dotfilepatcher.cpp index efc6341..7a65d89 100644 --- a/src/dotfilepatcher.cpp +++ b/src/dotfilepatcher.cpp @@ -173,7 +173,7 @@ static QCString replaceRef(const QCString &buf,const QCString relPath, QCString url = link.mid(marker+1); if (!ref.isEmpty()) { - result = externalLinkTarget(); + result = externalLinkTarget(true); if (result != "") setTarget = TRUE; } result+= href+"=\""; diff --git a/src/util.cpp b/src/util.cpp index 767f44a..fae2e90 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -8145,10 +8145,15 @@ void writeSummaryLink(OutputList &ol,const char *label,const char *title, } #endif -QCString externalLinkTarget() +QCString externalLinkTarget(const bool parent) { static bool extLinksInWindow = Config_getBool(EXT_LINKS_IN_WINDOW); - if (extLinksInWindow) return "target=\"_blank\" "; else return ""; + if (extLinksInWindow) + return "target=\"_blank\" "; + else if (parent) + return "target=\"_parent\" "; + else + return ""; } QCString externalRef(const QCString &relPath,const QCString &ref,bool href) @@ -440,7 +440,7 @@ QCString filterTitle(const QCString &title); bool patternMatch(const QFileInfo &fi,const QStrList *patList); -QCString externalLinkTarget(); +QCString externalLinkTarget(const bool parent = false); QCString externalRef(const QCString &relPath,const QCString &ref,bool href); int nextUtf8CharPosition(const QCString &utf8Str,int len,int startPos); const char *writeUtf8Char(FTextStream &t,const char *s); |