ngb/zeichenmaschine
1
0
Fork 0
mirror of https://github.com/jneug/zeichenmaschine.git synced 2026-10-12 09:56:33 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Color refactored

Browse Source
This commit is contained in:
ngb
2022-07-14 17:59:32 +02:00
parent 0098621ebe
commit 1e4b865492
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/schule/ngb/zm/Color.java
View File

@@ -146,7 +146,7 @@ public class Color {
* @param alpha Transparentwert zwischen 0 und 255.
*/
public Color( int red, int green, int blue, int alpha ) {
rgba = (alpha << 24) | (red << 16) | (green << 8) | blue;
rgba = ((alpha&0xFF) << 24) | ((red&0xFF) << 16) | ((green&0xFF) << 8) | ((blue&0xFF) << 0);
}
/**
@@ -473,7 +473,13 @@ public class Color {
* @return {@code true}, wenn die Objekte gleich sind, sonst {@code false}.
*/
public boolean equals( Object obj ) {
return obj instanceof Color && ((Color) obj).getRGBA() == this.rgba;
if( obj == null ) { return false; }
if( obj instanceof Color ) {
return ((Color) obj).getRGBA() == this.rgba;
} else if( obj instanceof java.awt.Color ) {
return ((java.awt.Color) obj).getRGB() == this.rgba;
}
return false;
}
/**