[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing icons

Kaffe CVS cvs-commits at kaffe.org
Sun Jul 17 09:46:45 PDT 2005


PatchSet 6743 
Date: 2005/07/17 16:40:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: swing icons

2005-07-17  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        * libraries/javalib/Makefile.am.in:
        (classpath_icons) Added the icons directory.
        (JAR_CMD_TOOLS) Renamed from JAR_CMD_6.
        (JAR_CMD_6) Added command for archiving the icons.

        * libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Error.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Inform.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/JavaCup.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/JavaCupLarge.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Question.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeClosed.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeLeaf-normal.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeOpen.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Warn.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/file-folders.png,
        libraries/javalib/gnu/javax/swing/plaf/gtk/icons/slider.png:
        New files. Taken from GNU Classpath.

        2005-07-11  Lillian Angel  <langel at redhat.com>

        * javax/swing/plaf/basic/BasicTreeUI.java
        (getCellBounds): added width of icon, so selection fits over
        the cell properly.
        * javax/swing/plaf/basic/BasicLookAndFeel.java
        added in icons for the tree.

Members: 
	ChangeLog:1.4267->1.4268 
	libraries/javalib/Makefile.am:1.374->1.375 
	libraries/javalib/Makefile.am.in:1.45->1.46 
	libraries/javalib/Makefile.in:1.464->1.465 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Error.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Inform.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/JavaCup.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/JavaCupLarge.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Question.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeClosed.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeLeaf-normal.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeOpen.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Warn.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/file-folders.png:INITIAL->1.1 
	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/slider.png:INITIAL->1.1 
	libraries/javalib/javax/swing/plaf/basic/BasicLookAndFeel.java:1.16->1.17 
	libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4267 kaffe/ChangeLog:1.4268
--- kaffe/ChangeLog:1.4267	Sun Jul 17 15:32:15 2005
+++ kaffe/ChangeLog	Sun Jul 17 16:40:05 2005
@@ -1,3 +1,34 @@
+2005-07-17  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+        * libraries/javalib/Makefile.am.in:
+	(classpath_icons) Added the icons directory.
+	(JAR_CMD_TOOLS) Renamed from JAR_CMD_6.
+	(JAR_CMD_6) Added command for archiving the icons.
+
+	* libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Error.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Inform.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/JavaCup.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/JavaCupLarge.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Question.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeClosed.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeLeaf-normal.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeOpen.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Warn.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/file-folders.png,
+	libraries/javalib/gnu/javax/swing/plaf/gtk/icons/slider.png:
+	New files. Taken from GNU Classpath.
+
+	2005-07-11  Lillian Angel  <langel at redhat.com>
+
+        * javax/swing/plaf/basic/BasicTreeUI.java
+        (getCellBounds): added width of icon, so selection fits over
+        the cell properly.
+        * javax/swing/plaf/basic/BasicLookAndFeel.java
+        added in icons for the tree.
+
 2005-07-17  Andreas Tobler  <toa at pop.agri.ch>
 
 	* config/powerpc/trampolines.S: Fixed PIC code for powerpc-linux.
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.374 kaffe/libraries/javalib/Makefile.am:1.375
--- kaffe/libraries/javalib/Makefile.am:1.374	Sat Jul 16 21:19:15 2005
+++ kaffe/libraries/javalib/Makefile.am	Sun Jul 17 16:40:08 2005
@@ -5422,6 +5422,20 @@
 	gnu/java/locale/LocaleInformation_zh_TW_Hant.properties \
 	java/util/iso4217.properties
 
+classpath_icons = \
+	gnu/javax/swing/plaf/gtk/icons/Error.png \
+	gnu/javax/swing/plaf/gtk/icons/Inform.png Ã\
+	gnu/javax/swing/plaf/gtk/icons/JavaCup.png \
+	gnu/javax/swing/plaf/gtk/icons/JavaCupLarge.png \
+	gnu/javax/swing/plaf/gtk/icons/Question.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeClosed.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeLeaf-normal.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeOpen.png \
+	gnu/javax/swing/plaf/gtk/icons/Warn.png \
+	gnu/javax/swing/plaf/gtk/icons/file-folders.png \
+	gnu/javax/swing/plaf/gtk/icons/slider.png
+
 EXTRA_DIST = \
 	Makefile.am.in \
 	META-INF \
@@ -5454,7 +5468,8 @@
 JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
 JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
 JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
-JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools)
+JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_icons))
+JAR_CMD_TOOLS = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools)
 
 .PHONY: jar-classes
 if USE_PRECOMPILED_RT_JAR
@@ -5470,7 +5485,7 @@
 
 tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
 	rm -f tools.jar
-	$(JAR_CMD6)
+	$(JAR_CMD_TOOLS)
 	mv $@.new $@
 else
 ## classes is provided for backward compatibility; use compile-classes
@@ -5492,13 +5507,14 @@
 	$(JAR_CMD3)
 	$(JAR_CMD4)
 	$(JAR_CMD5)
+	$(JAR_CMD6)
 	mv $@.new $@
 
 # Put gnu.bytecode into tools.jar to avoid problems
 # with applications using their own version of it.
 tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
 	rm -f tools.jar
-	$(JAR_CMD6)
+	$(JAR_CMD_TOOLS)
 	mv $@.new $@
 endif
 
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.45 kaffe/libraries/javalib/Makefile.am.in:1.46
--- kaffe/libraries/javalib/Makefile.am.in:1.45	Sun Jun 12 13:11:48 2005
+++ kaffe/libraries/javalib/Makefile.am.in	Sun Jul 17 16:40:09 2005
@@ -326,6 +326,20 @@
 	gnu/java/locale/LocaleInformation_zh_TW_Hant.properties \
 	java/util/iso4217.properties
 
+classpath_icons = \
+	gnu/javax/swing/plaf/gtk/icons/Error.png \
+	gnu/javax/swing/plaf/gtk/icons/Inform.png Ã\
+	gnu/javax/swing/plaf/gtk/icons/JavaCup.png \
+	gnu/javax/swing/plaf/gtk/icons/JavaCupLarge.png \
+	gnu/javax/swing/plaf/gtk/icons/Question.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeClosed.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeLeaf-normal.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeOpen.png \
+	gnu/javax/swing/plaf/gtk/icons/Warn.png \
+	gnu/javax/swing/plaf/gtk/icons/file-folders.png \
+	gnu/javax/swing/plaf/gtk/icons/slider.png
+
 EXTRA_DIST = \
 	Makefile.am.in \
 	META-INF \
@@ -358,7 +372,8 @@
 JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
 JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
 JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
-JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools)
+JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_icons))
+JAR_CMD_TOOLS = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools)
 
 .PHONY: jar-classes
 if USE_PRECOMPILED_RT_JAR
@@ -374,7 +389,7 @@
 
 tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
 	rm -f tools.jar
-	$(JAR_CMD6)
+	$(JAR_CMD_TOOLS)
 	mv $@.new $@
 else
 ## classes is provided for backward compatibility; use compile-classes
@@ -396,13 +411,14 @@
 	$(JAR_CMD3)
 	$(JAR_CMD4)
 	$(JAR_CMD5)
+	$(JAR_CMD6)
 	mv $@.new $@
 
 # Put gnu.bytecode into tools.jar to avoid problems
 # with applications using their own version of it.
 tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
 	rm -f tools.jar
-	$(JAR_CMD6)
+	$(JAR_CMD_TOOLS)
 	mv $@.new $@
 endif
 
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.464 kaffe/libraries/javalib/Makefile.in:1.465
--- kaffe/libraries/javalib/Makefile.in:1.464	Sat Jul 16 21:19:15 2005
+++ kaffe/libraries/javalib/Makefile.in	Sun Jul 17 16:40:09 2005
@@ -6093,6 +6093,20 @@
 	gnu/java/locale/LocaleInformation_zh_TW_Hant.properties \
 	java/util/iso4217.properties
 
+classpath_icons = \
+	gnu/javax/swing/plaf/gtk/icons/Error.png \
+	gnu/javax/swing/plaf/gtk/icons/Inform.png Ã\
+	gnu/javax/swing/plaf/gtk/icons/JavaCup.png \
+	gnu/javax/swing/plaf/gtk/icons/JavaCupLarge.png \
+	gnu/javax/swing/plaf/gtk/icons/Question.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeClosed.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeLeaf-normal.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png \
+	gnu/javax/swing/plaf/gtk/icons/TreeOpen.png \
+	gnu/javax/swing/plaf/gtk/icons/Warn.png \
+	gnu/javax/swing/plaf/gtk/icons/file-folders.png \
+	gnu/javax/swing/plaf/gtk/icons/slider.png
+
 EXTRA_DIST = \
 	Makefile.am.in \
 	META-INF \
@@ -6107,7 +6121,8 @@
 JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
 JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
 JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
-JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools)
+JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_icons))
+JAR_CMD_TOOLS = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools)
 all: all-recursive
 
 .SUFFIXES:
@@ -6472,7 +6487,7 @@
 
 @USE_PRECOMPILED_RT_JAR_TRUE at tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
 @USE_PRECOMPILED_RT_JAR_TRUE@	rm -f tools.jar
- at USE_PRECOMPILED_RT_JAR_TRUE@	$(JAR_CMD6)
+ at USE_PRECOMPILED_RT_JAR_TRUE@	$(JAR_CMD_TOOLS)
 @USE_PRECOMPILED_RT_JAR_TRUE@	mv $@.new $@
 @USE_PRECOMPILED_RT_JAR_FALSE at compile-classes $(LIBDIR)/stamp classes: $(rebuildLib) $(Klasses_jar_SRCS)
 @USE_PRECOMPILED_RT_JAR_FALSE@	rm -rf $(LIBDIR)
@@ -6492,13 +6507,14 @@
 @USE_PRECOMPILED_RT_JAR_FALSE@	$(JAR_CMD3)
 @USE_PRECOMPILED_RT_JAR_FALSE@	$(JAR_CMD4)
 @USE_PRECOMPILED_RT_JAR_FALSE@	$(JAR_CMD5)
+ at USE_PRECOMPILED_RT_JAR_FALSE@	$(JAR_CMD6)
 @USE_PRECOMPILED_RT_JAR_FALSE@	mv $@.new $@
 
 # Put gnu.bytecode into tools.jar to avoid problems
 # with applications using their own version of it.
 @USE_PRECOMPILED_RT_JAR_FALSE at tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
 @USE_PRECOMPILED_RT_JAR_FALSE@	rm -f tools.jar
- at USE_PRECOMPILED_RT_JAR_FALSE@	$(JAR_CMD6)
+ at USE_PRECOMPILED_RT_JAR_FALSE@	$(JAR_CMD_TOOLS)
 @USE_PRECOMPILED_RT_JAR_FALSE@	mv $@.new $@
 
 .PHONY: build-classes Klasses
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Error.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Error.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Inform.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Inform.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/JavaCup.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/JavaCup.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/JavaCupLarge.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/JavaCupLarge.png,v
VERS: 1.1
***************
cvs [checkout aborted]: received broken pipe signal
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Question.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Question.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeClosed.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeClosed.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeLeaf-normal.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeLeaf-normal.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeOpen.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/TreeOpen.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Warn.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/Warn.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/file-folders.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/file-folders.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
===================================================================
Checking out kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/slider.png
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/javax/swing/plaf/gtk/icons/slider.png,v
VERS: 1.1
***************
Binary files /dev/null and - differ
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicLookAndFeel.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicLookAndFeel.java:1.16 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicLookAndFeel.java:1.17
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicLookAndFeel.java:1.16	Sun Jul 17 15:24:12 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicLookAndFeel.java	Sun Jul 17 16:40:13 2005
@@ -47,6 +47,7 @@
 import java.util.Enumeration;
 import java.util.ResourceBundle;
 
+import javax.swing.ImageIcon;
 import javax.swing.KeyStroke;
 import javax.swing.LookAndFeel;
 import javax.swing.UIDefaults;
@@ -54,6 +55,7 @@
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.DimensionUIResource;
 import javax.swing.plaf.FontUIResource;
+import javax.swing.plaf.IconUIResource;
 import javax.swing.plaf.InsetsUIResource;
 import javax.swing.text.JTextComponent;
 
@@ -1017,12 +1019,18 @@
         "ctrl PAGE_DOWN", "scrollDownChangeLead"
       }),
       "Tree.font", new FontUIResource("Dialog", Font.PLAIN, 12),
-//      "Tree.expandedIcon", new IconUIResource(new ImageIcon("icons/TreeExpanded.png")),
+      "Tree.closedIcon",
+         new IconUIResource(new ImageIcon(getClass().getResource(
+            "/gnu/javax/swing/plaf/gtk/icons/TreeClosed.png"))),
       "Tree.foreground", new ColorUIResource(Color.black),
       "Tree.hash", new ColorUIResource(Color.gray),
-//      "Tree.leafIcon", new IconUIResource(new ImageIcon("icons/TreeLeaf.png")),
+      "Tree.leafIcon", 
+         new IconUIResource(new ImageIcon(getClass().getResource(
+            "/gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png"))),
       "Tree.leftChildIndent", new Integer(7),
-//      "Tree.openIcon", new IconUIResource(new ImageIcon("icons/TreeOpen.png")),
+      "Tree.openIcon", 
+         new IconUIResource(new ImageIcon(getClass().getResource(
+            "/gnu/javax/swing/plaf/gtk/icons/TreeOpen.png"))),
       "Tree.rightChildIndent", new Integer(13),
       "Tree.rowHeight", new Integer(16),
       "Tree.scrollsOnExpand", Boolean.TRUE,
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.9 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.10
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.9	Sun Jul 10 02:11:42 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java	Sun Jul 17 16:40:14 2005
@@ -2383,9 +2383,10 @@
          String s = cell.toString();
          Font f = tree.getFont();
          FontMetrics fm = tree.getToolkit().getFontMetrics(tree.getFont());
-
-         return new Rectangle(x, y, SwingUtilities.computeStringWidth(fm, s),
-               fm.getHeight());
+         
+         // add 22 to width for icon, FIXME later
+         return new Rectangle(x, y, SwingUtilities.computeStringWidth(fm, s)
+               + 22, fm.getHeight());
       }
       return null;
    }




More information about the kaffe mailing list