/[classpath]/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
ViewVC logotype

Diff of /classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java

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

revision 1.10.2.10 by gnu_andrew, Wed Nov 2 00:43:59 2005 UTC revision 1.10.2.11 by gnu_andrew, Sun Nov 27 21:00:40 2005 UTC
# Line 208  public class BasicTabbedPaneUI extends T Line 208  public class BasicTabbedPaneUI extends T
208            incrButton = createIncreaseButton();            incrButton = createIncreaseButton();
209            decrButton = createDecreaseButton();            decrButton = createDecreaseButton();
210          }          }
211        tabPane.layout();        tabPane.revalidate();
212        tabPane.repaint();        tabPane.repaint();
213      }      }
214    }    }
# Line 241  public class BasicTabbedPaneUI extends T Line 241  public class BasicTabbedPaneUI extends T
241       */       */
242      public void calculateLayoutInfo()      public void calculateLayoutInfo()
243      {      {
244          assureRectsCreated(tabPane.getTabCount());
245          contentRect = SwingUtilities.calculateInnerArea(tabPane, contentRect);
246    
247        calculateTabRects(tabPane.getTabPlacement(), tabPane.getTabCount());        calculateTabRects(tabPane.getTabPlacement(), tabPane.getTabCount());
248    
249        if (tabPane.getSelectedIndex() != -1)        if (tabPane.getSelectedIndex() != -1)
# Line 286  public class BasicTabbedPaneUI extends T Line 289  public class BasicTabbedPaneUI extends T
289                componentWidth = Math.max(componentWidth, dims.width);                componentWidth = Math.max(componentWidth, dims.width);
290              }              }
291          }          }
       Insets insets = tabPane.getInsets();  
   
292        if (tabPlacement == SwingConstants.TOP        if (tabPlacement == SwingConstants.TOP
293            || tabPlacement == SwingConstants.BOTTOM)            || tabPlacement == SwingConstants.BOTTOM)
294          {          {
# Line 331  public class BasicTabbedPaneUI extends T Line 332  public class BasicTabbedPaneUI extends T
332      {      {
333        if (tabCount == 0)        if (tabCount == 0)
334          return;          return;
       assureRectsCreated(tabCount);  
335    
336        FontMetrics fm = getFontMetrics();        FontMetrics fm = getFontMetrics();
337        SwingUtilities.calculateInnerArea(tabPane, calcRect);        SwingUtilities.calculateInnerArea(tabPane, calcRect);
# Line 944  public class BasicTabbedPaneUI extends T Line 944  public class BasicTabbedPaneUI extends T
944      {      {
945        if (tabCount == 0)        if (tabCount == 0)
946          return;          return;
       assureRectsCreated(tabCount);  
947    
948        FontMetrics fm = getFontMetrics();        FontMetrics fm = getFontMetrics();
949        SwingUtilities.calculateInnerArea(tabPane, calcRect);        SwingUtilities.calculateInnerArea(tabPane, calcRect);
950        Insets tabAreaInsets = getTabAreaInsets(tabPlacement);        Insets tabAreaInsets = getTabAreaInsets(tabPlacement);
951        Insets insets = tabPane.getInsets();        Insets insets = tabPane.getInsets();
       int max = 0;  
952        int runs = 1;        int runs = 1;
953        int start = 0;        int start = 0;
954        int top = 0;        int top = 0;
# Line 959  public class BasicTabbedPaneUI extends T Line 957  public class BasicTabbedPaneUI extends T
957          {          {
958            int maxHeight = calculateMaxTabHeight(tabPlacement);            int maxHeight = calculateMaxTabHeight(tabPlacement);
959            calcRect.width -= tabAreaInsets.left + tabAreaInsets.right;            calcRect.width -= tabAreaInsets.left + tabAreaInsets.right;
           max = calcRect.width + tabAreaInsets.left + insets.left;  
960            start = tabAreaInsets.left + insets.left;            start = tabAreaInsets.left + insets.left;
961            int width = 0;            int width = 0;
962            int runWidth = start;            int runWidth = start;
# Line 996  public class BasicTabbedPaneUI extends T Line 993  public class BasicTabbedPaneUI extends T
993            int maxWidth = calculateMaxTabWidth(tabPlacement);            int maxWidth = calculateMaxTabWidth(tabPlacement);
994    
995            calcRect.height -= tabAreaInsets.top + tabAreaInsets.bottom;            calcRect.height -= tabAreaInsets.top + tabAreaInsets.bottom;
           max = calcRect.height + tabAreaInsets.top;  
996            int height = 0;            int height = 0;
997            start = tabAreaInsets.top + insets.top;            start = tabAreaInsets.top + insets.top;
998            int runHeight = start;            int runHeight = start;
# Line 1048  public class BasicTabbedPaneUI extends T Line 1044  public class BasicTabbedPaneUI extends T
1044        if (tabCount == 0)        if (tabCount == 0)
1045          return;          return;
1046        int tabPlacement = tabPane.getTabPlacement();        int tabPlacement = tabPane.getTabPlacement();
1047        incrButton.hide();        incrButton.setVisible(false);
1048        decrButton.hide();        decrButton.setVisible(false);
1049        if (tabPlacement == SwingConstants.TOP        if (tabPlacement == SwingConstants.TOP
1050            || tabPlacement == SwingConstants.BOTTOM)            || tabPlacement == SwingConstants.BOTTOM)
1051          {          {
# Line 1068  public class BasicTabbedPaneUI extends T Line 1064  public class BasicTabbedPaneUI extends T
1064                                     decrDims.width, tabAreaRect.height);                                     decrDims.width, tabAreaRect.height);
1065    
1066                tabAreaRect.width -= decrDims.width + incrDims.width;                tabAreaRect.width -= decrDims.width + incrDims.width;
1067                incrButton.show();                incrButton.setVisible(true);
1068                decrButton.show();                decrButton.setVisible(true);
1069              }              }
1070          }          }
1071    
# Line 1092  public class BasicTabbedPaneUI extends T Line 1088  public class BasicTabbedPaneUI extends T
1088                                     incrDims.height);                                     incrDims.height);
1089    
1090                tabAreaRect.height -= decrDims.height + incrDims.height;                tabAreaRect.height -= decrDims.height + incrDims.height;
1091                incrButton.show();                incrButton.setVisible(true);
1092                decrButton.show();                decrButton.setVisible(true);
1093              }              }
1094          }          }
1095        viewport.setBounds(tabAreaRect.x, tabAreaRect.y, tabAreaRect.width,        viewport.setBounds(tabAreaRect.x, tabAreaRect.y, tabAreaRect.width,
# Line 1348  public class BasicTabbedPaneUI extends T Line 1344  public class BasicTabbedPaneUI extends T
1344    public BasicTabbedPaneUI()    public BasicTabbedPaneUI()
1345    {    {
1346      super();      super();
1347        rects = new Rectangle[0];
1348        tabRuns = new int[10];
1349    }    }
1350    
1351    /**    /**
# Line 1460  public class BasicTabbedPaneUI extends T Line 1458  public class BasicTabbedPaneUI extends T
1458                    
1459          layoutManager = createLayoutManager();          layoutManager = createLayoutManager();
1460          tabPane.setLayout(layoutManager);          tabPane.setLayout(layoutManager);
         tabPane.layout();  
1461        }        }
1462    }    }
1463    
# Line 1884  public class BasicTabbedPaneUI extends T Line 1881  public class BasicTabbedPaneUI extends T
1881    protected void paintIcon(Graphics g, int tabPlacement, int tabIndex,    protected void paintIcon(Graphics g, int tabPlacement, int tabIndex,
1882                             Icon icon, Rectangle iconRect, boolean isSelected)                             Icon icon, Rectangle iconRect, boolean isSelected)
1883    {    {
1884      icon.paintIcon(tabPane, g, iconRect.x, iconRect.y);      if (icon != null)
1885          icon.paintIcon(tabPane, g, iconRect.x, iconRect.y);
1886    }    }
1887    
1888    /**    /**
# Line 2110  public class BasicTabbedPaneUI extends T Line 2108  public class BasicTabbedPaneUI extends T
2108    protected void paintContentBorder(Graphics g, int tabPlacement,    protected void paintContentBorder(Graphics g, int tabPlacement,
2109                                      int selectedIndex)                                      int selectedIndex)
2110    {    {
     Insets insets = getContentBorderInsets(tabPlacement);  
2111      int x = contentRect.x;      int x = contentRect.x;
2112      int y = contentRect.y;      int y = contentRect.y;
2113      int w = contentRect.width;      int w = contentRect.width;
# Line 2396  public class BasicTabbedPaneUI extends T Line 2393  public class BasicTabbedPaneUI extends T
2393     */     */
2394    protected void assureRectsCreated(int tabCount)    protected void assureRectsCreated(int tabCount)
2395    {    {
2396      if (rects == null)      if (rects.length < tabCount)
       rects = new Rectangle[tabCount];  
     if (tabCount == rects.length)  
       return;  
     else  
2397        {        {
2398          int numToCopy = Math.min(tabCount, rects.length);          Rectangle[] old = rects;
2399          Rectangle[] tmp = new Rectangle[tabCount];          rects = new Rectangle[tabCount];
2400          System.arraycopy(rects, 0, tmp, 0, numToCopy);          System.arraycopy(old, 0, rects, 0, old.length);
2401          rects = tmp;          for (int i = old.length; i < rects.length; i++)
2402              rects[i] = new Rectangle();
2403        }        }
2404    }    }
2405    
# Line 2763  public class BasicTabbedPaneUI extends T Line 2757  public class BasicTabbedPaneUI extends T
2757     */     */
2758    protected FontMetrics getFontMetrics()    protected FontMetrics getFontMetrics()
2759    {    {
2760      FontMetrics fm = tabPane.getToolkit().getFontMetrics(tabPane.getFont());      FontMetrics fm = tabPane.getFontMetrics(tabPane.getFont());
2761      return fm;      return fm;
2762    }    }
2763    

Legend:
Removed from v.1.10.2.10  
changed lines
  Added in v.1.10.2.11

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