Missing controls when enabling both HTML_CODE_FOLDER and CREATE_SUBDIRS

Author: doxygen

src/htmlgen.cpp

@@ -2825,7 +2825,7 @@ static void writeDefaultQuickLinks(TextStream &t,bool compact,
     QCString initCodeFold;
     if (Config_getBool(HTML_CODE_FOLDING))
     {
-      initCodeFold="init_codefold();";
+      initCodeFold=QCString("init_codefold(") + (relPath.isEmpty() ? "0" : "1") + ");";
     }
     if (Config_getBool(SEARCHENGINE))
     {

templates/html/darkmode_settings.css

@@ -152,6 +152,8 @@
 --fold-line-color: #808080;
 --fold-minus-image: url('minusd.svg');
 --fold-plus-image: url('plusd.svg');
+--fold-minus-image-relpath: url('../../minusd.svg');
+--fold-plus-image-relpath: url('../../plusd.svg');
 
 /** font-family */
 --font-family-normal: Roboto,sans-serif;

templates/html/dynsections.js

@@ -122,17 +122,18 @@ function toggleInherit(id)
 }
 
 var opened=true;
-var plusImg  = "var(--fold-plus-image)";
-var minusImg = "var(--fold-minus-image)";
+// in case HTML_COLORSTYLE is LIGHT or DARK the vars will be replaced, so we write them out explicitly and use double quotes
+var plusImg  = [ "var(--fold-plus-image)",  "var(--fold-plus-image-relpath)" ];
+var minusImg = [ "var(--fold-minus-image)", "var(--fold-minus-image-relpath)" ];
 
 // toggle all folding blocks
-function codefold_toggle_all() {
+function codefold_toggle_all(relPath) {
  if (opened) {
-   $('#fold_all').css('background-image',plusImg);
+   $('#fold_all').css('background-image',plusImg[relPath]);
    $('div[id^=foldopen]').hide();
    $('div[id^=foldclosed]').show();
  } else {
-   $('#fold_all').css('background-image',minusImg);
+   $('#fold_all').css('background-image',minusImg[relPath]);
    $('div[id^=foldopen]').show();
    $('div[id^=foldclosed]').hide();
  }
@@ -144,7 +145,7 @@ function codefold_toggle(id) {
   $('#foldopen'+id).toggle();
   $('#foldclosed'+id).toggle();
 }
-function init_codefold() {
+function init_codefold(relPath) {
   $('span[class=lineno]').css(
     {'padding-right':'4px',
      'margin-right':'2px',
@@ -153,7 +154,9 @@ function init_codefold() {
      'background':'linear-gradient(var(--fold-line-color),var(--fold-line-color)) no-repeat 46px/2px 100%'
     });
   // add global toggle to first line
-  $('span[class=lineno]:first').append('<span class="fold" id="fold_all" onclick="javascript:codefold_toggle_all();" style="background-image:'+minusImg+';"></span>');
+  $('span[class=lineno]:first').append('<span class="fold" id="fold_all" '+
+                                             'onclick="javascript:codefold_toggle_all('+relPath+');" '+
+                                             'style="background-image:'+minusImg[relPath]+';"></span>');
   // add vertical lines to other rows
   $('span[class=lineno]').not(':eq(0)').append('<span class="fold"></span>');
   // add toggle controls to lines with fold divs
@@ -164,7 +167,9 @@ function init_codefold() {
     var start = $(this).attr('data-start');
     var end   = $(this).attr('data-end');
     // replace normal fold span with controls for the first line of a foldable fragment
-    $(this).find('span[class=fold]:first').replaceWith('<span class="fold" onclick="javascript:codefold_toggle(\''+id+'\');" style="background-image:'+minusImg+';"></span>');
+    $(this).find('span[class=fold]:first').replaceWith('<span class="fold" '+
+                                                       'onclick="javascript:codefold_toggle(\''+id+'\');" '+
+                                                       'style="background-image:'+minusImg[relPath]+';"></span>');
     // append div for folded (closed) representation
     $(this).after('<div id="foldclosed'+id+'" class="foldclosed" style="display:none;"></div>');
     // extract the first line from the "open" section to represent closed content
@@ -176,7 +181,7 @@ function init_codefold() {
       $(line).html($(line).html().replace(new RegExp('\\s*'+start+'\\s*$','g'),''));
     }
     // replace minus with plus symbol
-    $(line).find('span[class=fold]').css('background-image',plusImg);
+    $(line).find('span[class=fold]').css('background-image',plusImg[relPath]);
     // append ellipsis
     $(line).append(' '+start+'<a href="javascript:codefold_toggle(\''+id+'\')">&#8230;</a>'+end);
     // insert constructed line into closed div

templates/html/lightmode_settings.css

@@ -152,6 +152,8 @@
 --fold-line-color: #808080;
 --fold-minus-image: url('minus.svg');
 --fold-plus-image: url('plus.svg');
+--fold-minus-image-relpath: url('../../minus.svg');
+--fold-plus-image-relpath: url('../../plus.svg');
 
 /** font-family */
 --font-family-normal: Roboto,sans-serif;