3efc804257786933e42b35d63f4fbe82a12feec2
Merge parents 7f58f19 a3ebab6
tdreszer
  Fri Aug 5 10:59:58 2011 -0700
Merge branches 'master' and 'master' into tdreszer-subCfg
diff --cc src/hg/hgTracks/imageV2.h
index 46fc625,8a0e28b..345432b
--- src/hg/hgTracks/imageV2.h
+++ src/hg/hgTracks/imageV2.h
@@@ -1,32 -1,32 +1,32 @@@
  /* imageV2 - API for creating the image V2 features. */
  
  #ifndef IMAGEV2_H
  #define IMAGEV2_H
  
  // set IN_PLACE_UPDATE 1 to update the hgTracks image in-place in the client.
 -#define IN_PLACE_UPDATE  0
 +#define IN_PLACE_UPDATE  1
  
  //  UNCOMMENT IMAGEv2_DRAG_SCROLL and IMAGEv2_DRAG_SCROLL_SZ to allow dragScroll
  //  NOTE: 1x should work fine. Set IMAGEv2_DRAG_SCROLL_SZ > 1 (3=3x) to see hidden image while dragging.
  //        Problems with >1x: nextExon and nextItem arrows not addressed.  Dynamic resize occasionally fails.
 -//#define IMAGEv2_DRAG_SCROLL
 -//#define IMAGEv2_DRAG_SCROLL_SZ 1
 +#define IMAGEv2_DRAG_SCROLL
 +#define IMAGEv2_DRAG_SCROLL_SZ 1
  
- #if defined(IMAGEv2_DRAG_SCROLL_SZ) && (IMAGEv2_DRAG_SCROLL_SZ > 1)
+ #ifdef IMAGEv2_DRAG_SCROLL
      #define IMAGEv2_SHORT_MAPITEMS
- #endif// defined(IMAGEv2_DRAG_SCROLL_SZ) && (IMAGEv2_DRAG_SCROLL_SZ > 1)
+ #endif//def IMAGEv2_DRAG_SCROLL
  
  // CURRENT PROBLEMS with dragScroll > 1X:
  // o Dynamic height for data/label based on image map currently works EXCEPT, occasionally does not resize.  Consider resize while dragging!
  // o next item feature '>>' arrows should check if items are in the wings
  // o next exon feature '>>' arrows are only seen in the wings and only look belond the wings
  
  // UNCOMMENT  USE_NAVIGATION_LINKS for so far experimental UI changes to replace buttons at top with more streamlined links
  //#define USE_NAVIGATION_LINKS
  
  extern struct imgBox   *theImgBox;   // Make this global for now to avoid huge rewrite
  //extern struct image    *theOneImg;   // Make this global for now to avoid huge rewrite
  extern struct imgTrack *curImgTrack; // Make this global for now to avoid huge rewrite
  //extern struct imgSlice *curSlice;    // Make this global for now to avoid huge rewrite
  //extern struct mapSet   *curMap;      // Make this global for now to avoid huge rewrite
  //extern struct mapItem  *curMapItem;  // Make this global for now to avoid huge rewrite