mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 10:48:00 +00:00
Solved splash swatch switch snafu.
This commit is contained in:
@@ -150,10 +150,10 @@ public class SplashFrame extends JFrame {
|
||||
contentPane.getActionMap().put("escAction", new CloseAction());
|
||||
|
||||
// Set UI to color splash bar filled/unfilled states with skin colors
|
||||
UIManager.put("ProgressBar.background", skin.getColor("progress1"));
|
||||
UIManager.put("ProgressBar.selectionBackground", skin.getColor("progress2"));
|
||||
UIManager.put("ProgressBar.foreground", skin.getColor("progress3"));
|
||||
UIManager.put("ProgressBar.selectionForeground", skin.getColor("progress4"));
|
||||
UIManager.put("ProgressBar.background", skin.getColor("emptyBackground"));
|
||||
UIManager.put("ProgressBar.selectionBackground", skin.getColor("emptyText"));
|
||||
UIManager.put("ProgressBar.foreground", skin.getColor("fullBackground"));
|
||||
UIManager.put("ProgressBar.selectionForeground", skin.getColor("fullText"));
|
||||
UIManager.put("ProgressBar.border", new LineBorder(skin.getColor("theme"), 0));
|
||||
|
||||
// Instantiate model and view and tie together.
|
||||
|
||||
@@ -108,10 +108,10 @@ public class FSkin {
|
||||
final int w = image.getWidth();
|
||||
this.setImage("bg.splash", image.getSubimage(0, 0, w, h - 100));
|
||||
|
||||
this.setColor("progress1", this.getColorFromPixel(image.getRGB(25, h - 75)));
|
||||
this.setColor("progress2", this.getColorFromPixel(image.getRGB(25, h - 25)));
|
||||
this.setColor("progress3", this.getColorFromPixel(image.getRGB(75, h - 75)));
|
||||
this.setColor("progress4", this.getColorFromPixel(image.getRGB(75, h - 25)));
|
||||
this.setColor("emptyBackground", this.getColorFromPixel(image.getRGB(25, h - 75)));
|
||||
this.setColor("emptyText", this.getColorFromPixel(image.getRGB(75, h - 75)));
|
||||
this.setColor("fullBackground", this.getColorFromPixel(image.getRGB(25, h - 25)));
|
||||
this.setColor("fullText", this.getColorFromPixel(image.getRGB(75, h - 25)));
|
||||
} catch (final IOException e) {
|
||||
System.err.println(this.notfound + this.spriteFile);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user