Skip to content

Commit

Permalink
ADD: More color support
Browse files Browse the repository at this point in the history
  • Loading branch information
janisstreib committed Apr 29, 2015
1 parent 2d26a03 commit d78649d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
25 changes: 18 additions & 7 deletions src/de/yellowant/xojtoimage/xournalelements/Color.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
package de.yellowant.xojtoimage.xournalelements;

public enum Color {
BLACK(java.awt.Color.BLACK), YELLOW(java.awt.Color.YELLOW), ORANGE(
java.awt.Color.ORANGE), RED(java.awt.Color.RED), BLUE(
java.awt.Color.BLUE), WHITE(java.awt.Color.WHITE), GRAY(
java.awt.Color.GRAY), LIGHTBLUE(java.awt.Color.CYAN), LIGHTGREEN(
java.awt.Color.decode("0x3dff00")), MAGENTA(java.awt.Color.MAGENTA), GREEN(
public class Color {
public static final Color BLACK = new Color(java.awt.Color.BLACK);
public static final Color YELLOW = new Color(java.awt.Color.YELLOW);
public static final Color ORANGE = new Color(java.awt.Color.ORANGE);
public static final Color RED = new Color(java.awt.Color.RED);
public static final Color BLUE = new Color(java.awt.Color.BLUE);
public static final Color WHITE = new Color(java.awt.Color.WHITE);
public static final Color GRAY = new Color(java.awt.Color.GRAY);
public static final Color LIGHTBLUE = new Color(java.awt.Color.CYAN);
public static final Color LIGHTGREEN = new Color(
java.awt.Color.decode("0x3dff00"));
public static final Color MAGENTA = new Color(java.awt.Color.MAGENTA);
public static final Color GREEN = new Color(
java.awt.Color.decode("0x1a7100"));

private java.awt.Color awtColor;

Color(java.awt.Color awtColor) {
Expand All @@ -24,6 +31,10 @@ public java.awt.Color getAwtColor() {
}

public static Color getColorByName(String name) {
if (name.startsWith("#")) {
name = name.replace("#", "0x");
return new Color(java.awt.Color.decode(name.substring(0, 8)));
}
switch (name.trim().toLowerCase()) {
case "black":
return BLACK;
Expand Down
Binary file modified test.xoj
Binary file not shown.

0 comments on commit d78649d

Please sign in to comment.