c47b72480a741cb22f2d0b0d9f0bff9b3dd8809a jcasper Fri Mar 17 09:51:58 2023 -0700 Updating a couple of other minor locations to better reflect transparency code, refs #30569 diff --git src/hg/hgTracks/longRangeTrack.c src/hg/hgTracks/longRangeTrack.c index 86f760c..20740b9 100644 --- src/hg/hgTracks/longRangeTrack.c +++ src/hg/hgTracks/longRangeTrack.c @@ -10,36 +10,31 @@ { if ( tg->visibility == tvDense) return tl.fontHeight; int min, max, deflt, current; cartTdbFetchMinMaxPixels(cart, tg->tdb, LONG_MINHEIGHT, LONG_MAXHEIGHT, atoi(LONG_DEFHEIGHT), &min, &max, &deflt, ¤t); return tg->height = current; } static Color longRangeItemColor(struct track *tg, void *item, struct hvGfx *hvg) /* Return color to draw a long range item */ { struct longRange *lr = item; if (lr->hasColor) { - struct rgbColor itemRgb; - // There must be a better way... - itemRgb.r = (lr->rgb & 0xff0000) >> 16; - itemRgb.g = (lr->rgb & 0xff00) >> 8; - itemRgb.b = lr->rgb & 0xff; - return hvGfxFindColorIx(hvg, itemRgb.r, itemRgb.g, itemRgb.b); + return bedColorToGfxColor(lr->rgb); } return tg->ixColor; } static void longRangeDraw(struct track *tg, int seqStart, int seqEnd, struct hvGfx *hvg, int xOff, int yOff, int width, MgFont *font, Color color, enum trackVisibility vis) /* Draw a list of longTabix structures. */ { /* Choose drawing style by cart var (at least for now) */ #define DRAW_LINE 0 #define DRAW_CURVE 1 #define DRAW_ELLIPSE 2 char *drawMode = cartUsualString(cart, "interaction", "line"); int draw = DRAW_LINE;