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

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

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

revision 1.17 by rabbit78, Wed Oct 12 19:50:33 2005 UTC revision 1.18 by rabbit78, Thu Oct 13 18:33:05 2005 UTC
# Line 261  public class ScrollPaneLayout Line 261  public class ScrollPaneLayout
261          Dimension viewportSize = viewport.getPreferredSize();          Dimension viewportSize = viewport.getPreferredSize();
262          int width = viewportSize.width;          int width = viewportSize.width;
263          int height = viewportSize.height;          int height = viewportSize.height;
264          if (hsb.isVisible())          if (hsb != null && hsb.isVisible())
265            height += hsb.getPreferredSize().height;            height += hsb.getPreferredSize().height;
266          if (vsb.isVisible())          if (vsb != null && vsb.isVisible())
267            width += vsb.getPreferredSize().width;            width += vsb.getPreferredSize().width;
268          if (rowHead != null && rowHead.isVisible())          if (rowHead != null && rowHead.isVisible())
269            width += rowHead.getPreferredSize().width;            width += rowHead.getPreferredSize().width;
# Line 283  public class ScrollPaneLayout Line 283  public class ScrollPaneLayout
283          Dimension viewportSize = viewport.getMinimumSize();          Dimension viewportSize = viewport.getMinimumSize();
284          int width = viewportSize.width;          int width = viewportSize.width;
285          int height = viewportSize.height;          int height = viewportSize.height;
286          if (hsb.isVisible())          if (hsb != null && hsb.isVisible())
287            height += hsb.getMinimumSize().height;            height += hsb.getMinimumSize().height;
288          if (vsb.isVisible())          if (vsb != null && vsb.isVisible())
289            width += vsb.getMinimumSize().width;            width += vsb.getMinimumSize().width;
290          if (rowHead != null && rowHead.isVisible())          if (rowHead != null && rowHead.isVisible())
291            width += rowHead.getMinimumSize().width;            width += rowHead.getMinimumSize().width;

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

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