From f90382b54a6cde9e06538e46d3ab8e13aff74a9e Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Wed, 18 Jan 2012 09:38:16 +0000 Subject: [PATCH] Solved splash swatch switch snafu. --- src/main/java/forge/view/home/SplashFrame.java | 8 ++++---- src/main/java/forge/view/toolbox/FSkin.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/forge/view/home/SplashFrame.java b/src/main/java/forge/view/home/SplashFrame.java index 08e79276d6e..289d681923a 100644 --- a/src/main/java/forge/view/home/SplashFrame.java +++ b/src/main/java/forge/view/home/SplashFrame.java @@ -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. diff --git a/src/main/java/forge/view/toolbox/FSkin.java b/src/main/java/forge/view/toolbox/FSkin.java index 2057baa3a85..5253bcfc9df 100644 --- a/src/main/java/forge/view/toolbox/FSkin.java +++ b/src/main/java/forge/view/toolbox/FSkin.java @@ -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); }