[GME-commit] GMESRC/GME/Gme ScrollZoomView.cpp,1.13,1.14 PannButton.cpp,1.8,1.9

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv5487

Modified Files:
	ScrollZoomView.cpp PannButton.cpp 
Log Message:
pann window blinking corrected in connection mode

CVS User: bogyom

Index: ScrollZoomView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/ScrollZoomView.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ScrollZoomView.cpp	31 May 2004 22:13:54 -0000	1.13
--- ScrollZoomView.cpp	3 Jun 2004 19:14:48 -0000	1.14
***************
*** 429,432 ****
--- 429,433 ----
  	if (maxh == 0  &&  maxv == 0)
  	{
+ 		TRACE("notifyPanning from ScrollToDevicePosition - maxh == 0  &&  maxv == 0\n");
  		notifyPanning(ptDev);
  		return;
***************
*** 444,447 ****
--- 445,449 ----
  	ptDev.x = min(maxh, ptDev.x);
  	ptDev.y = min(maxv, ptDev.y);
+ 	TRACE("notifyPanning from ScrollToDevicePosition\n");
  	notifyPanning(ptDev);
  //	ScrollWindow(xOrig - ptDev.x, yOrig - ptDev.y);
***************
*** 1116,1119 ****
--- 1118,1122 ----
  
  	// terge
+ 	TRACE("notifyPanning from OnScrollBy\n");
  	notifyPanning(GetDeviceScrollPosition());
  

Index: PannButton.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/PannButton.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PannButton.cpp	27 May 2004 21:48:10 -0000	1.8
--- PannButton.cpp	3 Jun 2004 19:14:48 -0000	1.9
***************
*** 95,102 ****
  	m_oriToStoredRx = (double)(m_bitmapSizeStored.Width())/ m_bitmapSizeOri.Width();
  	m_oriToStoredRy = (double)(m_bitmapSizeStored.Height())/ m_bitmapSizeOri.Height();
! 	m_viewRectOnStored.left = (int)(irect.left * m_oriToStoredRx);
! 	m_viewRectOnStored.right = (int)(irect.right * m_oriToStoredRx);
! 	m_viewRectOnStored.top = (int)(irect.top * m_oriToStoredRy);
! 	m_viewRectOnStored.bottom = (int)(irect.bottom * m_oriToStoredRy);
  	CRect vRect(0,0,0,0);
  	CRect client;
--- 95,108 ----
  	m_oriToStoredRx = (double)(m_bitmapSizeStored.Width())/ m_bitmapSizeOri.Width();
  	m_oriToStoredRy = (double)(m_bitmapSizeStored.Height())/ m_bitmapSizeOri.Height();
! 	CRect newViewRectOnStored;
! 	newViewRectOnStored.left = (int)(irect.left * m_oriToStoredRx);
! 	newViewRectOnStored.right = (int)(irect.right * m_oriToStoredRx);
! 	newViewRectOnStored.top = (int)(irect.top * m_oriToStoredRy);
! 	newViewRectOnStored.bottom = (int)(irect.bottom * m_oriToStoredRy);
! 	if (m_viewRectOnStored.EqualRect(&newViewRectOnStored))
! 		return;
! 	else
! 		m_viewRectOnStored = newViewRectOnStored;
! 
  	CRect vRect(0,0,0,0);
  	CRect client;