external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support caching derived colors for reuse and actually updating colors when skin changed

Browse Source
This commit is contained in:
drdev
2013-09-02 16:28:02 +00:00
parent 2f39539135
commit 1a08cd6ae4
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/forge/gui/toolbox/FSkin.java
View File

@@ -376,8 +376,9 @@ public enum FSkin {
public static class SkinColor { public static class SkinColor {
private static final HashMap<Colors, SkinColor> baseColors = new HashMap<Colors, SkinColor>(); private static final HashMap<Colors, SkinColor> baseColors = new HashMap<Colors, SkinColor>();
private static final HashMap<String, SkinColor> derivedColors = new HashMap<String, SkinColor>();
private static final int NO_BRIGHTNESS_DELTA = 0; private static final int NO_BRIGHTNESS_DELTA = 0;
private static final int NO_STEP = -10000; //needs to be large negative since small negative values are valid private static final int NO_STEP = -999; //needs to be large negative since small negative values are valid
private static final int NO_ALPHA = -1; private static final int NO_ALPHA = -1;
private final Colors baseColor; private final Colors baseColor;
@@ -398,20 +399,30 @@ public enum FSkin {
this.updateColor(); this.updateColor();
} }
private SkinColor getDerivedColor(int brightnessDelta0, int step0, int alpha0) {
String key = this.baseColor.name() + "|" + brightnessDelta0 + "|" + step0 + "|" + alpha0;
SkinColor derivedColor = derivedColors.get(key);
if (derivedColor == null) {
derivedColor = new SkinColor(this.baseColor, brightnessDelta0, step0, alpha0);
derivedColors.put(key, derivedColor);
}
return derivedColor;
}
public SkinColor brighter() { public SkinColor brighter() {
return new SkinColor(this.baseColor, this.brightnessDelta + 1, this.step, this.alpha); return getDerivedColor(this.brightnessDelta + 1, this.step, this.alpha);
} }
public SkinColor darker() { public SkinColor darker() {
return new SkinColor(this.baseColor, this.brightnessDelta - 1, this.step, this.alpha); return getDerivedColor(this.brightnessDelta - 1, this.step, this.alpha);
} }
public SkinColor stepColor(int step0) { public SkinColor stepColor(int step0) {
return new SkinColor(this.baseColor, this.brightnessDelta, step0, this.alpha); return getDerivedColor(this.brightnessDelta, step0, this.alpha);
} }
public SkinColor alphaColor(int alpha0) { public SkinColor alphaColor(int alpha0) {
return new SkinColor(this.baseColor, this.brightnessDelta, this.step, alpha0); return getDerivedColor(this.brightnessDelta, this.step, alpha0);
} }
private void updateColor() { private void updateColor() {
@@ -472,6 +483,14 @@ public enum FSkin {
SkinColor.baseColors.put(c, new SkinColor(c)); SkinColor.baseColors.put(c, new SkinColor(c));
} }
} }
else { //update existing SkinColors if baseColors already initialized
for (final SkinColor c : SkinColor.baseColors.values()) {
c.updateColor();
}
for (final SkinColor c : SkinColor.derivedColors.values()) {
c.updateColor();
}
}
} }
private void updateColor() { private void updateColor() {
@@ -837,6 +856,7 @@ public enum FSkin {
prefs.save(); prefs.save();
//load skin //load skin
loaded = false; //reset this temporarily until end of loadFull()
loadLight(skinName, false); loadLight(skinName, false);
loadFull(); loadFull();