From 95ba6002eb7d5e8c43a64a239d39ca99015caa09 Mon Sep 17 00:00:00 2001
From: David Hebbeker <david@hebbeker.info>
Date: Tue, 29 Dec 2020 23:44:22 +0100
Subject: Draw sibling directories in parent directory.

---
 src/dotdirdeps.cpp | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/dotdirdeps.cpp b/src/dotdirdeps.cpp
index bd154f6..af5e8e9 100644
--- a/src/dotdirdeps.cpp
+++ b/src/dotdirdeps.cpp
@@ -60,7 +60,15 @@ void writeDotDirDepGraph(FTextStream &t,const DirDef *dd,bool linkRelations)
   QDict<DirDef> dirsInGraph(257);
 
   dirsInGraph.insert(dd->getOutputFileBase(),dd);
-  if (dd->parent())
+
+  std::vector<const DirDef *> usedDirsToBeDrawn;
+  for(const auto& usedDir : dd->usedDirs())
+  {
+    usedDirsToBeDrawn.push_back(usedDir->dir());
+  }
+
+  const auto parent = dd->parent();
+  if (parent)
   {
     t << "  subgraph cluster" << dd->parent()->getOutputFileBase() << " {\n";
     t << "    graph [ bgcolor=\"#ddddee\", pencolor=\"black\", label=\""
@@ -68,6 +76,21 @@ void writeDotDirDepGraph(FTextStream &t,const DirDef *dd,bool linkRelations)
       << "\" fontname=\"" << fontName << "\", fontsize=\"" << fontSize << "\", URL=\"";
     t << dd->parent()->getOutputFileBase() << Doxygen::htmlFileExtension;
     t << "\"]\n";
+
+    {
+      // draw all directories which have `dd->parent()` as parent and `dd` as dependent
+      const auto newEnd = std::remove_if(usedDirsToBeDrawn.begin(), usedDirsToBeDrawn.end(), [&](const DirDef *const usedDir)
+      {
+        if (usedDir->parent() == parent)
+        {
+          drawDirectory(t, usedDir, usedDir->isCluster() && !Config_getBool(DOT_TRANSPARENT), dirsInGraph);
+          return true;
+        }
+        return false;
+      }
+      );
+      usedDirsToBeDrawn.erase(newEnd, usedDirsToBeDrawn.end());
+    }
   }
   if (dd->isCluster())
   {
@@ -100,10 +123,9 @@ void writeDotDirDepGraph(FTextStream &t,const DirDef *dd,bool linkRelations)
   // add nodes for other used directories
   {
     //printf("*** For dir %s\n",shortName().data());
-    for (const auto &udir : dd->usedDirs())
+    for (const auto &usedDir : usedDirsToBeDrawn)
       // for each used dir (=directly used or a parent of a directly used dir)
     {
-      const DirDef *usedDir = udir->dir();
       const DirDef *dir=dd;
       while (dir)
       {
-- 
cgit v0.12