PatchSet 6509
Date: 2005/05/15 17:15:59
Author: robilad
Branch: HEAD
Tag: (none)
Log:
resynced with gnu classpath: swing fixes
2005-05-15 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2005-05-04 Roman Kennke <[EMAIL PROTECTED]>
* javax/swing/text/PlainView.java
(drawUnselectedText): Call Utilities.drawTabbedText() with correct
offset parameter.
* javax/swing/text/Utilities.java
(drawTabbedText): Initilialize local variable pos correctly.
Members:
ChangeLog:1.4034->1.4035
libraries/javalib/javax/swing/text/PlainView.java:1.5->1.6
libraries/javalib/javax/swing/text/Utilities.java:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4034 kaffe/ChangeLog:1.4035
--- kaffe/ChangeLog:1.4034 Sun May 15 17:14:45 2005
+++ kaffe/ChangeLog Sun May 15 17:15:59 2005
@@ -2,6 +2,18 @@
Resynced with GNU Classpath.
+ 2005-05-04 Roman Kennke <[EMAIL PROTECTED]>
+
+ * javax/swing/text/PlainView.java
+ (drawUnselectedText): Call Utilities.drawTabbedText() with correct
+ offset parameter.
+ * javax/swing/text/Utilities.java
+ (drawTabbedText): Initilialize local variable pos correctly.
+
+2005-05-15 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2005-05-03 Thomas Fitzsimmons <[EMAIL PROTECTED]>
* java/awt/image/VolatileImage.java: Document.
Index: kaffe/libraries/javalib/javax/swing/text/PlainView.java
diff -u kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.5
kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.6
--- kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.5 Wed Jan 26
13:40:06 2005
+++ kaffe/libraries/javalib/javax/swing/text/PlainView.java Sun May 15
17:16:05 2005
@@ -148,7 +148,7 @@
g.setColor(unselectedColor);
Segment segment = new Segment();
getDocument().getText(p0, p1 - p0, segment);
- return Utilities.drawTabbedText(segment, x, y, g, this, 0);
+ return Utilities.drawTabbedText(segment, x, y, g, this, segment.offset);
}
public void paint(Graphics g, Shape s)
Index: kaffe/libraries/javalib/javax/swing/text/Utilities.java
diff -u kaffe/libraries/javalib/javax/swing/text/Utilities.java:1.4
kaffe/libraries/javalib/javax/swing/text/Utilities.java:1.5
--- kaffe/libraries/javalib/javax/swing/text/Utilities.java:1.4 Sat Feb 19
15:14:19 2005
+++ kaffe/libraries/javalib/javax/swing/text/Utilities.java Sun May 15
17:16:05 2005
@@ -92,7 +92,7 @@
int ascent = metrics.getAscent();
int pixelWidth = 0;
- int pos = 0;
+ int pos = s.offset;
int len = 0;
for (int offset = s.offset; offset < (s.offset + s.count); ++offset)
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
