diff --git a/.gitignore b/.gitignore index f98d220611a..a9ec3ba43b7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,8 @@ res/quest/questData.dat res/quest/questData.dat.xml res/reprintSetInfo.log res/setInfoScript.log +src/main/java/forge/gui/match +src/main/java/forge/gui/toolbox +src/main/java/forge/gui/unfinished /target /test-output diff --git a/res/images/skins/default/palette.jpg b/res/images/skins/default/palette.jpg index e874623f4b5..8eecc8d1627 100644 Binary files a/res/images/skins/default/palette.jpg and b/res/images/skins/default/palette.jpg differ diff --git a/res/images/skins/rebel/palette.jpg b/res/images/skins/rebel/palette.jpg index e874623f4b5..2955bab5e8b 100644 Binary files a/res/images/skins/rebel/palette.jpg and b/res/images/skins/rebel/palette.jpg differ diff --git a/src/main/java/forge/view/swing/SplashFrame.java b/src/main/java/forge/view/swing/SplashFrame.java index 6951542a105..2f51e745032 100644 --- a/src/main/java/forge/view/swing/SplashFrame.java +++ b/src/main/java/forge/view/swing/SplashFrame.java @@ -15,6 +15,7 @@ import javax.swing.JLabel; import javax.swing.KeyStroke; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; +import javax.swing.UIManager; import forge.gui.skin.FSkin; import net.slightlymagic.braids.util.progress_monitor.BraidsProgressMonitor; @@ -121,6 +122,9 @@ public class SplashFrame extends JFrame { contentPane.getActionMap().put("escAction", new closeAction()); + // Set UI to color splash bar fill with theme colors + UIManager.put("ProgressBar.foreground", skin.bg1b); // Filled + UIManager.put("ProgressBar.selectionForeground",skin.txt1a);// Filled // Instantiate model and view and tie together. monitorModel = new SplashProgressModel();