[GME-commit] GMESRC/GME/MgaDecorators BoxDecorator.cpp,1.41,1.42

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

Update of /project/gme-repository/GMESRC/GME/MgaDecorators
In directory escher:/tmp/cvs-serv3852

Modified Files:
	BoxDecorator.cpp 
Log Message:
Ports shifted on a modelreference only if the reference uses the bitmap of the referred element, and its surrounded by a black rectangle.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: BoxDecorator.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/MgaDecorators/BoxDecorator.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** BoxDecorator.cpp	31 Aug 2005 21:33:49 -0000	1.41
--- BoxDecorator.cpp	2 Nov 2006 19:21:16 -0000	1.42
***************
*** 210,214 ****
  		*ex = cRect.right;
  		*ey = cRect.bottom;
! 		if ( m_pDecorator->getType() == OBJTYPE_REFERENCE ) {	// HACK
  			*sy += 2;
  			*ey += 2;
--- 210,221 ----
  		*ex = cRect.right;
  		*ey = cRect.bottom;
! 
! 		// if a reference has an icon specified for itself 
! 		// then it is not surrounded by a black rectangle.
! 		// if it doesn't have an icon, then the icon of the
! 		// referred element is used, and it is surrounded
! 		// that's why we shift port locations only if
! 		// the surrounding rectangle is there (borderwidth > 0)
! 		if ( m_pDecorator->getBorderWidth(false) > 0 && m_pDecorator->getType() == OBJTYPE_REFERENCE ) {	// HACK
  			*sy += 2;
  			*ey += 2;