CVSROOT: /cvsroot/classpath Module name: classpath Changes by: Roman Kennke <rabbit78> 06/08/04 11:09:13
Modified files: javax/swing : SwingUtilities.java javax/swing/plaf/basic: BasicButtonListener.java BasicButtonUI.java . : ChangeLog Log message: 2006-08-04 Roman Kennke <[EMAIL PROTECTED]> * javax/swing/SwingUtilities.java (layoutCompoundLabel(JComponent,FontMetrics,String,Icon,int,int,int, int,Rectangle,Rectangle,Rectangle,int)): Delegate to new layoutCompoundLabelImpl(). (layoutCompoundLabel(FontMetrics,String,Icon,int,int,int,int, Rectangle,Rectangle,Rectangle,int)): Delegate to new layoutCompoundLabelImpl(). (layoutCompoundLabelImpl): New helper method. Moved impl from layoutCompoundLabel() to here and added handling of HTML. * javax/swing/plaf/basic/BasicButtonUI.java (installUI): Update HTML view if appropriate. (uninstallUI): New method. Do the usual uninstallUI things and uninstall HTML view. (getMinimumSize): New method. Adjusts the minimum size by the HTML view minimum size. (getMaximumSize): New method. Adjusts the maximum size by the HTML view maximum size. (getPreferredSize): Pass the button's iconTextGap to the BasicGraphicsUtils method. (paint): Let HTML view paint the text, if present. * javax/swing/plaf/basic/BasicButtonListener.java (propertyChange): Update the HTML view when the button's text is changed. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/SwingUtilities.java?cvsroot=classpath&r1=1.55&r2=1.56 http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicButtonListener.java?cvsroot=classpath&r1=1.16&r2=1.17 http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicButtonUI.java?cvsroot=classpath&r1=1.39&r2=1.40 http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.8316&r2=1.8317