[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz/vob/vobs TextVob.java
From: |
Matti Katila |
Subject: |
[Gzz-commits] gzz/gzz/vob/vobs TextVob.java |
Date: |
Fri, 10 Jan 2003 05:01:25 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Matti Katila <address@hidden> 03/01/10 05:01:25
Modified files:
gzz/vob/vobs : TextVob.java
Log message:
fix color
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TextVob.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: gzz/gzz/vob/vobs/TextVob.java
diff -u gzz/gzz/vob/vobs/TextVob.java:1.9 gzz/gzz/vob/vobs/TextVob.java:1.10
--- gzz/gzz/vob/vobs/TextVob.java:1.9 Fri Jan 10 03:19:35 2003
+++ gzz/gzz/vob/vobs/TextVob.java Fri Jan 10 05:01:25 2003
@@ -48,7 +48,7 @@
* XXX Diagram!
*/
public class TextVob extends HBox.VobHBox {
-String rcsid = "$Id: TextVob.java,v 1.9 2003/01/10 08:19:35 mudyc Exp $";
+String rcsid = "$Id: TextVob.java,v 1.10 2003/01/10 10:01:25 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -59,14 +59,6 @@
protected Object key;
- /** Same as another constructor but in GL side you can give the color
- * with string like "Color 1 0.5 0.5"
- * @param color OpenGL Color used to draw the text.
- */
- public TextVob(TextStyle style, String text, boolean baselined, String
color) {
- this(style, text, baselined);
- this.textColor = color;
- }
/** Create a new TextVob.
* @param style The textstyle to use.
@@ -76,12 +68,24 @@
* If false, the text will be comfortably within
the box.
*/
public TextVob(TextStyle style, String text, boolean baselined) {
+ this(style, text, baselined, null);
+ }
+
+ /** Same as another constructor but in GL side you can give the color
+ * with string like "Color 1 0.5 0.5"
+ * @param color OpenGL Color used to draw the text.
+ */
+ public TextVob(TextStyle style, String text, boolean baselined, String
color) {
super();
this.style = style;
this.baselined = baselined;
this.text = text;
+
+ if (color != null)
+ this.textColor = color;
}
+
/** Create a non-baselined text vob.
*/
public TextVob(TextStyle style, String text) {
@@ -89,7 +93,10 @@
}
public TextVob(TextStyle style, String text, boolean baselined, Object
key) {
- this(style, text, baselined);
+ this(style, text, baselined, null);
+ }
+ public TextVob(TextStyle style, String text, boolean baselined, Object
key, String color) {
+ this(style, text, baselined, color);
this.key = key;
}