git://source.jalview.org
/
jalviewjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1807 - Bob's last(?) before leaving Dundee -- adds fast file loading
[jalviewjs.git]
/
site
/
j2s
/
java
/
awt
/
Color.js
diff --git
a/site/j2s/java/awt/Color.js
b/site/j2s/java/awt/Color.js
index
c726fe1
..
431d7e7
100644
(file)
--- a/
site/j2s/java/awt/Color.js
+++ b/
site/j2s/java/awt/Color.js
@@
-40,9
+40,17
@@
case 2:
this.value = (a[1] ? a[0] : 0xff000000 | a[0]);
break;
case 3:
this.value = (a[1] ? a[0] : 0xff000000 | a[0]);
break;
case 3:
+var n = a[0] + a[1] + a[2];
+if (n > 0 && n < 3.001)
+this.setFloat(a[0], a[1], a[2], 1);
+else
this.setColor4(a[0], a[1], a[2], 255);
break;
case 4:
this.setColor4(a[0], a[1], a[2], 255);
break;
case 4:
+var n = a[0] + a[1] + a[2] + a[3];
+if (n > 0 && n < 4.001)
+this.setFloat(a[0], a[1], a[2], a[3]);
+else
this.setColor4(a[0], a[1], a[2], a[3]);
break;
}
this.setColor4(a[0], a[1], a[2], a[3]);
break;
}