a3ebab6b88099fcd6e2f7dafcb393677ef97fdc4 tdreszer Fri Aug 5 10:59:18 2011 -0700 Restricted some map items to not cover width of image but only width of label or width of item. This should make dragScroll more obvious. diff --git src/hg/hgTracks/imageV2.c src/hg/hgTracks/imageV2.c index b5f834f..bfb7f85 100644 --- src/hg/hgTracks/imageV2.c +++ src/hg/hgTracks/imageV2.c @@ -1782,31 +1782,31 @@ } } // Adjustment for portal if(imgBox->showPortal && imgBox->basesPerPixel > 0 && (sliceType==stData || sliceType==stCenter)) { offsetX += (imgBox->portalStart - imgBox->chromStart) / imgBox->basesPerPixel; width=imgBox->portalWidth; } hPrintf(" <div style='width:%dpx; height:%dpx;",width,height); if (sliceType == stCenter && imgTrack->centerLabelSeen == clNotSeen) hPrintf(" display:none;"); hPrintf("' class='sliceDiv %s",sliceTypeToClass(slice->type)); #ifdef IMAGEv2_DRAG_SCROLL - if(imgBox->showPortal && sliceType==stData) + if(imgBox->showPortal && (sliceType==stData || sliceType==stCenter)) hPrintf(" panDiv%s",(scrollHandle?" scroller":"")); #endif //def IMAGEv2_DRAG_SCROLL hPrintf("'>\n"); } struct mapSet *map = sliceGetMap(slice,FALSE); // Could be the image map or slice specific if(map) useMap = imageMapDraw(map,name); else if(slice->link != NULL) { if(skipToSpaces(slice->link) != NULL) hPrintf(" <A HREF=%s",slice->link); else hPrintf(" <A HREF='%s'",slice->link); if (slice->title != NULL) { @@ -1916,36 +1916,40 @@ safef(name, sizeof(name), "btn_%s", trackName); hPrintf(" <TD id='td_%s'%s>\n",name,(imgTrack->reorderable?" class='dragHandle'":"")); sliceAndMapDraw(imgBox,imgTrack,stButton,name,FALSE); hPrintf("</TD>\n"); // leftLabel safef(name,sizeof(name),"side_%s",trackName); if (imgTrack->reorderable) hPrintf(" <TD id='td_%s' class='dragHandle' title='%s%sdrag to reorder'>\n",name,htmlEncode(imgTrack->tdb->longLabel),newLine); else hPrintf(" <TD id='td_%s'>\n",name); sliceAndMapDraw(imgBox,imgTrack,stSide,name,FALSE); hPrintf("</TD>\n"); } // Main/Data image region +#ifdef IMAGEv2_DRAG_SCROLL + hPrintf(" <TD id='td_data_%s' title='click & drag to scroll; shift+click & drag to zoom' width=%d class='tdData'>\n", trackName, imgBox->width); +#else///ifndef IMAGEv2_DRAG_SCROLL hPrintf(" <TD id='td_data_%s' width=%d class='tdData'>\n", trackName, imgBox->width); +#endif//ndef IMAGEv2_DRAG_SCROLL // centerLabel if(imgTrack->hasCenterLabel) { safef(name, sizeof(name), "center_%s", trackName); - sliceAndMapDraw(imgBox,imgTrack,stCenter,name,FALSE); + sliceAndMapDraw(imgBox,imgTrack,stCenter,name,TRUE); hPrintf("\n"); } // data image safef(name, sizeof(name), "data_%s", trackName); sliceAndMapDraw(imgBox,imgTrack,stData,name,(imgTrack->order>0)); hPrintf("</TD>\n"); if(imgBox->showSideLabel && !imgTrack->plusStrand) { // rightLabel safef(name, sizeof(name), "side_%s", trackName); if (imgTrack->reorderable) hPrintf(" <TD id='td_%s' class='dragHandle' title='%s%sdrag to reorder'>\n",name,htmlEncode(imgTrack->tdb->longLabel),newLine); else hPrintf(" <TD id='td_%s'>\n",name);