f5ba7e5371b8bcf6c260d065b971e57c09eca1ad
Merge parents 189bd07 d24ed48
kate
  Wed Sep 25 10:56:06 2019 -0700
Merging

diff --cc src/hg/hgTracks/simpleTracks.c
index 79d91567,7a18109..37d7198
--- src/hg/hgTracks/simpleTracks.c
+++ src/hg/hgTracks/simpleTracks.c
@@@ -785,32 -793,32 +793,32 @@@
  		rows = packCountRowsOverflow(tg, floor(maxHeight/tg->lineHeight)+1, FALSE, FALSE, vis);
  	    }
  	else
  	    {
  	    rows = slCount(tg->items);
  	    }
  	break;
      case tvPack:
  	{
  	if(allowOverflow && itemCount < maxItemsToUseOverflow)
  	    rows = packCountRowsOverflow(tg, floor(maxHeight/tg->lineHeight), TRUE, allowOverflow, vis);
  	else
  	    rows = packCountRowsOverflow(tg, floor(maxHeight/tg->lineHeight)+1, TRUE, FALSE, vis);
          if (tdbIsCompositeChild(tg->tdb))
              {
--            boolean doCollapse = doCollapseEmptySubtracks(tg);
--            if (isCenterLabelsPackOff(tg) && !doCollapse)
++            boolean doHideEmpties = doHideEmptySubtracks(tg, NULL, NULL);
++            if (isCenterLabelsPackOff(tg) && !doHideEmpties)
                  if (rows == 0)
                      rows = 1;   // compact pack mode, shows just side label
              }
  	break;
  	}
      case tvSquish:
          {
  	tg->heightPer = heightPer/2;
  	if ((tg->heightPer & 1) == 0)
  	    tg->heightPer -= 1;
  	tg->lineHeight = tg->heightPer + 1;
  	if(allowOverflow && itemCount < maxItemsToUseOverflow)
  	    rows = packCountRowsOverflow(tg, floor(maxHeight/tg->lineHeight), FALSE, allowOverflow, vis);
  	else
  	    rows = packCountRowsOverflow(tg, floor(maxHeight/tg->lineHeight)+1, FALSE, FALSE, vis);