Skip to content
Snippets Groups Projects
Commit ab1be307 authored by rds's avatar rds
Browse files

Fixes bumping of 3 frame translation when shown as one column.

Does not fix the issue where the column needs to shrink/expand on zooming
parent 1ba359fd
No related branches found
No related tags found
No related merge requests found
......@@ -26,9 +26,9 @@
*
* Exported functions: See ZMap/zmapWindow.h
* HISTORY:
* Last edited: Jan 22 11:15 2010 (edgrif)
* Last edited: Jan 28 01:11 2010 (roy)
* Created: Thu Jul 24 14:36:27 2003 (edgrif)
* CVS info: $Id: zmapWindow.c,v 1.306 2010-01-22 17:33:53 mh17 Exp $
* CVS info: $Id: zmapWindow.c,v 1.307 2010-01-27 12:38:04 rds Exp $
*-------------------------------------------------------------------
*/
......@@ -57,10 +57,6 @@
ZMapFeature FEATURE_GLOBAL_G = NULL ;
/* set a KNOWN initial size for the foo_canvas!
* ... the same size as foo_canvas sets ...
*/
#define ZMAP_CANVAS_INIT_SIZE (100.0)
/* Local struct to hold current features and new_features obtained from a server and
......
......@@ -28,9 +28,9 @@
*
* Exported functions: See zmapWindow_P.h
* HISTORY:
* Last edited: Jan 22 13:04 2010 (edgrif)
* Last edited: Jan 28 00:53 2010 (roy)
* Created: Thu Sep 8 10:34:49 2005 (edgrif)
* CVS info: $Id: zmapWindowDraw.c,v 1.117 2010-01-25 13:17:45 mh17 Exp $
* CVS info: $Id: zmapWindowDraw.c,v 1.118 2010-01-27 12:38:23 rds Exp $
*-------------------------------------------------------------------
*/
......@@ -962,7 +962,7 @@ static gboolean resetWindowWidthCB(ZMapWindowContainerGroup container, FooCanvas
x2 = x2 + excess + window->config.strand_spacing;
/* Annoyingly the initial size of the canvas is an issue here on first draw */
if(y2 == 100.0)
if(y2 == ZMAP_CANVAS_INIT_SIZE)
y2 = window->max_coord;
zmapWindowSetScrollRegion(window, &x1, &y1, &x2, &y2) ;
......
......@@ -26,9 +26,9 @@
*
* Exported functions:
* HISTORY:
* Last edited: Jan 26 11:53 2010 (edgrif)
* Last edited: Jan 28 01:16 2010 (roy)
* Created: Thu Jul 29 10:45:00 2004 (rnc)
* CVS info: $Id: zmapWindowDrawFeatures.c,v 1.261 2010-01-26 12:00:43 edgrif Exp $
* CVS info: $Id: zmapWindowDrawFeatures.c,v 1.262 2010-01-27 12:38:31 rds Exp $
*-------------------------------------------------------------------
*/
......@@ -304,6 +304,7 @@ void zmapWindowDrawFeatures(ZMapWindow window,
canvas_data.window = window;
canvas_data.canvas = window->canvas;
/* I have no idea why, but... */
/* Get the current scroll region */
zmapWindowGetScrollRegion(window, &ix1, &iy1, &ix2, &iy2);
......@@ -316,6 +317,15 @@ void zmapWindowDrawFeatures(ZMapWindow window,
}
else
{
double sx1,sy1,sx2,sy2;
sx1 = 0.0;
sy1 = window->min_coord;
sx2 = ZMAP_CANVAS_INIT_SIZE;
sy2 = window->max_coord;
zmapWindowSetScrollRegion(window, &sx1, &sy1, &sx2, &sy2);
/* Add a background to the root window, must be as long as entire sequence... */
root_group = zmapWindowContainerGroupCreateFromFoo(foo_canvas_root(window->canvas),
ZMAPCONTAINER_LEVEL_ROOT,
......
......@@ -25,9 +25,9 @@
* Description: Defines internal interfaces/data structures of zMapWindow.
*
* HISTORY:
* Last edited: Jan 26 10:56 2010 (edgrif)
* Last edited: Jan 28 00:54 2010 (roy)
* Created: Fri Aug 1 16:45:58 2003 (edgrif)
* CVS info: $Id: zmapWindow_P.h,v 1.253 2010-01-26 12:00:43 edgrif Exp $
* CVS info: $Id: zmapWindow_P.h,v 1.254 2010-01-27 12:38:42 rds Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_P_H
......@@ -45,6 +45,12 @@
#include <zmapWindowContainerUtils.h>
/* set a KNOWN initial size for the foo_canvas!
* ... the same size as foo_canvas sets ...
*/
#define ZMAP_CANVAS_INIT_SIZE (100.0)
/*
* This section details data that we attacht to the foocanvas items that represent
* contexts, aligns etc. Each data structure is accessed via a key given by the
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment