[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui CascadeInternalFramePositioner.java,1.3,1.4

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20009/fw/src/net/sourceforge/squirrel_sql/fw/gui

Modified Files:
	CascadeInternalFramePositioner.java 
Log Message:
Slider positions and selected tabs saved in Preferences (JDK 1.4). Bug fixes.

Index: CascadeInternalFramePositioner.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/CascadeInternalFramePositioner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CascadeInternalFramePositioner.java	1 Dec 2003 12:12:24 -0000	1.3
--- CascadeInternalFramePositioner.java	23 Apr 2005 17:23:35 -0000	1.4
***************
*** 18,22 ****
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
! import java.awt.Rectangle;
  import java.beans.PropertyVetoException;
  
--- 18,22 ----
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
! import java.awt.*;
  import java.beans.PropertyVetoException;
  
***************
*** 45,61 ****
  			throw new IllegalArgumentException("null JInternalFrame passed");
  		}
  		if (!child.isClosed())
  		{
  			if (child.getParent() != null)
  			{
! 				Rectangle parentBounds = child.getParent().getBounds();
! 				if (_x >= (parentBounds.width - MOVE))
! 				{
! 					_x = INITIAL_POS;
! 				}
! 				if (_y >= (parentBounds.height - MOVE))
! 				{
! 					_y = INITIAL_POS;
! 				}
  			}
  			if (child.isIcon())
--- 45,73 ----
  			throw new IllegalArgumentException("null JInternalFrame passed");
  		}
+ 
+       boolean toInitialPos = false;
+ 
  		if (!child.isClosed())
  		{
  			if (child.getParent() != null)
  			{
!             Dimension childSize = child.getSize();
! 
!             if(0 == childSize.width || 0 == childSize.height)
!             {
!                toInitialPos = true;
!             }
!             else
!             {
!                Rectangle parentBounds = child.getParent().getBounds();
!                if (_x + MOVE  + childSize.width >= parentBounds.width)
!                {
!                   _x = INITIAL_POS;
!                }
!                if (_y + MOVE + childSize.height >= parentBounds.height)
!                {
!                   _y = INITIAL_POS;
!                }
!             }
  			}
  			if (child.isIcon())
***************
*** 81,91 ****
  				}
  			}
! 			child.setBounds(_x, _y, child.getWidth(), child.getHeight());
! 			_x += MOVE;
! 			_y += MOVE;
! 			/*try {
! 				child.setSelected(true);
! 			} catch (PropertyVetoException ignore) {
! 			}*/
  		}
  	}
--- 93,107 ----
  				}
  			}
! 
!          if(toInitialPos)
!          {
!             child.setBounds(INITIAL_POS, INITIAL_POS, child.getWidth(), child.getHeight());
!          }
!          else
!          {
!             child.setBounds(_x, _y, child.getWidth(), child.getHeight());
!             _x += MOVE;
!             _y += MOVE;
!          }
  		}
  	}