29bb9d9b1bfd061016f2aeab00b8f030a8af6aab tdreszer Wed Aug 3 16:13:26 2011 -0700 A more complete fix for 1X scrolling with packed sideLabels being in image. There should be 2 separate images: data and side, and I had to find all cases that write to the sideLabel. doLeftLabel() functions were easy and taken care of by passing the right image pointer. But some drawItem code also wrote to side labels and this needed a global hvgSide pointer to write to. diff --git src/hg/hgTracks/hgTracks.h src/hg/hgTracks/hgTracks.h index d8a5664..a1ed954 100644 --- src/hg/hgTracks/hgTracks.h +++ src/hg/hgTracks/hgTracks.h @@ -367,30 +367,31 @@ extern int winEnd; /* End of window in sequence. */ extern int maxItemsInFullTrack; /* Maximum number of items displayed in full */ extern char *position; /* Name of position. */ extern int leftLabelWidthDefaultChars; /* default number of characters allowed for left label */ extern int leftLabelWidthChars; /* number of characters allowed for left label */ extern int trackTabWidth; extern int gfxBorder; /* Width of graphics border. */ extern int insideWidth; /* Width of area to draw tracks in in pixels. */ extern int insideX; /* Start of area to draw track in in pixels. */ extern int leftLabelX; /* Start of area to draw left labels on. */ extern int leftLabelWidth; /* Width of area to draw left labels on. */ extern boolean withLeftLabels; /* Display left labels? */ extern boolean withCenterLabels; /* Display center labels? */ extern boolean withGuidelines; /* Display guidelines? */ extern boolean withNextExonArrows; /* Display next exon navigation buttons near center labels? */ +extern struct hvGfx *hvgSide; // An extra pointer to a side label image that can be built if needed extern int seqBaseCount; /* Number of bases in sequence. */ extern int winBaseCount; /* Number of bases in window. */ extern float basesPerPixel; /* bases covered by a pixel; a measure of zoom */ extern boolean zoomedToBaseLevel; /* TRUE if zoomed so we can draw bases. */ extern boolean zoomedToCodonLevel; /* TRUE if zoomed so we can print codon text in genePreds*/ extern boolean zoomedToCdsColorLevel; /* TRUE if zoomed so we cancolor each codon*/ extern char *ctFileName; /* Custom track file. */ extern struct customTrack *ctList; /* Custom tracks. */ extern struct slName *browserLines; /* Custom track "browser" lines. */ extern int rulerMode; /* on, off, full */ extern boolean withLeftLabels; /* Display left labels? */ extern boolean withCenterLabels; /* Display center labels? */