/[classpath]/classpath/java/awt/BorderLayout.java
ViewVC logotype

Diff of /classpath/java/awt/BorderLayout.java

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

revision 1.15 by mark, Sat Jul 2 20:32:23 2005 UTC revision 1.16 by abalkiss, Wed Jul 20 20:30:33 2005 UTC
# Line 591  layoutContainer(Container target) Line 591  layoutContainer(Container target)
591        */        */
592    
593        int x1 = i.left;        int x1 = i.left;
594        int x2 = x1 + w.width + hgap;        int x2 = x1 + w.width + (w.width == 0 ? 0 : hgap);
595        int x3;        int x3;
596        if (t.width <= i.right + e.width)        if (t.width <= i.right + e.width)
597          x3 = x2 + w.width + hgap;          x3 = x2 + w.width + (w.width == 0 ? 0 : hgap);
598        else        else
599          x3 = t.width - i.right - e.width;          x3 = t.width - i.right - e.width;
600        int ww = t.width - i.right - i.left;        int ww = t.width - i.right - i.left;
601    
602        int y1 = i.top;        int y1 = i.top;
603        int y2 = y1 + n.height + vgap;        int y2 = y1 + n.height + (n.height == 0 ? 0 : vgap);
604        int midh = Math.max(e.height, Math.max(w.height, c.height));        int midh = Math.max(e.height, Math.max(w.height, c.height));
605        int y3;        int y3;
606        if (t.height <= i.bottom + s.height)        if (t.height <= i.bottom + s.height)
607          y3 = y2 + midh + vgap;          y3 = y2 + midh + vgap;
608        else        else
609          y3 = t.height - i.bottom - s.height;          y3 = t.height - i.bottom - s.height;
610        int hh = y3-y2-vgap;        int hh = y3-y2-(s.height == 0 ? 0 : vgap);
611    
612        setBounds(center, x2, y2, x3-x2-hgap, hh);        setBounds(center, x2, y2, x3-x2-(w.width == 0 ? 0 : hgap), hh);
613        setBounds(my_north, x1, y1, ww, n.height);        setBounds(my_north, x1, y1, ww, n.height);
614        setBounds(my_south, x1, y3, ww, s.height);        setBounds(my_south, x1, y3, ww, s.height);
615        setBounds(my_west, x1, y2, w.width, hh);        setBounds(my_west, x1, y2, w.width, hh);

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

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