[Octave-cvsupdate]
octave-forge/extra/jhandles/src/org/octave/graphics
PositionLayout.java, 1.1, 1.2
From: Michael G. <gof...@us...> - 2007-08-28 15:36:01
|
Update of /cvsroot/octave/octave-forge/extra/jhandles/src/org/octave/graphics In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8455/src/org/octave/graphics Modified Files: PositionLayout.java Log Message: small code move Index: PositionLayout.java =================================================================== RCS file: /cvsroot/octave/octave-forge/extra/jhandles/src/org/octave/graphics/PositionLayout.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PositionLayout.java 4 Jul 2007 15:00:52 -0000 1.1 +++ PositionLayout.java 28 Aug 2007 14:36:12 -0000 1.2 @@ -43,12 +43,7 @@ { Component comp = parent.getComponent(i); - if (comp instanceof RenderCanvas) - { - /* the render canvas takes up all the available space */ - comp.setBounds(ir.left, ir.top, r.width-ir.left-ir.right, r.height-ir.top-ir.bottom); - } - else if (comp instanceof Positionable) + if (comp instanceof Positionable) { /* use Position property of the object */ double[] pos = ((Positionable)comp).getPosition(); @@ -56,6 +51,11 @@ pos[1] = (r.height-ir.top-ir.bottom-pos[1]-pos[3]+1); comp.setBounds(ir.left+(int)pos[0], ir.top+(int)pos[1], (int)pos[2], (int)pos[3]); } + else if (comp instanceof RenderCanvas) + { + /* the render canvas takes up all the available space */ + comp.setBounds(ir.left, ir.top, r.width-ir.left-ir.right, r.height-ir.top-ir.bottom); + } else System.out.println("Warning: skipping layout component " + comp.toString()); } |