9a49290fedc8b4f9c7a631dedcfe8ac3aa2b4cee chinhli Thu Oct 20 14:10:43 2011 -0700 merge conflict resolved diff --git src/hg/hgTracks/cytoBandTrack.c src/hg/hgTracks/cytoBandTrack.c index 6eda8b5..63b9fda 100644 --- src/hg/hgTracks/cytoBandTrack.c +++ src/hg/hgTracks/cytoBandTrack.c @@ -180,44 +180,39 @@ hvGfxBox(hvg, x2, yOff+1, 2, yBorder, MG_RED); hvGfxUnclip(hvg); /* Put back the lineHeight for the track now that we are done spoofing tgDrawItems(). */ tg->heightPer += 11; tg->lineHeight += 11; } void cytoBandIdeoMapItem(struct track *tg, struct hvGfx *hvg, void *item, char *itemName, char *mapItemName, int start, int end, int x, int y, int width, int height) /* Print out a box to jump to band in browser window .*/ { struct cytoBand *cb = item; -if(advancedJavascriptFeaturesEnabled(cart)) - { + x = hvGfxAdjXW(hvg, x, width); hPrintf("name==NULL?"":cb->name),cb->chrom, cb->chromStart+1, cb->chromEnd); hPrintf(">\n"); - } -else - { - mapBoxJumpTo(hvg, x, y, width, height, tg, cb->chrom, cb->chromStart, cb->chromEnd, cb->name); - } + } int cytoBandIdeoTotalHeight(struct track *tg, enum trackVisibility vis) /* Return the (nonstandard) height of the cytoBandIdeo track. */ { tg->heightPer = tl.fontHeight + 11; tg->lineHeight = tl.fontHeight + 11; tg->limitedVisSet = TRUE; if(vis != tvHide && slCount(tg->items) > 0) { tg->limitedVis = tvDense; tg->height = tg->lineHeight; } else {