/[classpath]/classpath/javax/swing/BoxLayout.java
ViewVC logotype

Diff of /classpath/javax/swing/BoxLayout.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.18 by rabbit78, Sun Sep 25 10:17:19 2005 UTC revision 1.19 by rabbit78, Sun Sep 25 13:57:37 2005 UTC
# Line 42  import java.awt.Component; Line 42  import java.awt.Component;
42  import java.awt.ComponentOrientation;  import java.awt.ComponentOrientation;
43  import java.awt.Container;  import java.awt.Container;
44  import java.awt.Dimension;  import java.awt.Dimension;
45    import java.awt.Insets;
46  import java.awt.LayoutManager2;  import java.awt.LayoutManager2;
47    import java.awt.Rectangle;
48  import java.io.Serializable;  import java.io.Serializable;
49    
50  /**  /**
# Line 219  public class BoxLayout implements Layout Line 221  public class BoxLayout implements Layout
221      int[] vSpans = new int[children.length];      int[] vSpans = new int[children.length];
222      int[] vOffsets = new int[children.length];      int[] vOffsets = new int[children.length];
223    
224        Insets insets = container.getInsets();
225        int width = container.getWidth() - insets.left - insets.right - 1;
226        int height = container.getHeight() - insets.top - insets.bottom - 1;
227      if (isHorizontalIn(container))      if (isHorizontalIn(container))
228        {        {
229          SizeRequirements.calculateTiledPositions(container.getWidth(), null,          SizeRequirements.calculateTiledPositions(width, null,
230                                                   hSizeReqs, hOffsets, hSpans);                                                   hSizeReqs, hOffsets, hSpans);
231          SizeRequirements.calculateAlignedPositions(container.getHeight(), null,          SizeRequirements.calculateAlignedPositions(height, null,
232                                                   vSizeReqs, vOffsets, vSpans);                                                   vSizeReqs, vOffsets, vSpans);
233        }        }
234      else      else
235        {        {
236          SizeRequirements.calculateTiledPositions(container.getHeight(), null,          SizeRequirements.calculateTiledPositions(height, null,
237                                                   vSizeReqs, vOffsets, vSpans);                                                   vSizeReqs, vOffsets, vSpans);
238          SizeRequirements.calculateAlignedPositions(container.getWidth(), null,          SizeRequirements.calculateAlignedPositions(width, null,
239                                                   hSizeReqs, hOffsets, hSpans);                                                   hSizeReqs, hOffsets, hSpans);
240        }        }
241    
# Line 238  public class BoxLayout implements Layout Line 243  public class BoxLayout implements Layout
243      for (int i = 0; i < children.length; i++)      for (int i = 0; i < children.length; i++)
244        {        {
245          Component child = children[i];          Component child = children[i];
246          child.setBounds(hOffsets[i], vOffsets[i], hSpans[i], vSpans[i]);          child.setBounds(hOffsets[i] + insets.left, vOffsets[i] + insets.top,
247                            hSpans[i], vSpans[i]);
248        }        }
249    }    }
250      
251    /**    /**
252     * Adds a component to the layout. Not used in BoxLayout     * Adds a component to the layout. Not used in BoxLayout
253     *     *

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26