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

Added "theme2" to skin palette.

Browse Source
This commit is contained in:
Doublestrike
2012-02-05 04:58:39 +00:00
parent defcfe127f
commit 14bd09a91f
7 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/images/skins/darkascension/sprite_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 259 KiB

After

Width:  |  Height:  |  Size: 260 KiB

BIN
res/images/skins/default/sprite_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 574 KiB

After

Width:  |  Height:  |  Size: 575 KiB

BIN
res/images/skins/rebel/sprite_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 152 KiB

BIN
res/images/skins/smith/sprite_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

2
src/main/java/forge/view/bazaar/ViewItem.java
View File

@@ -35,7 +35,7 @@ public class ViewItem extends FRoundedPanel {
btnPurchase = new SubButton("Buy");
// Component styling
this.setBackground(Singletons.getView().getSkin().getColor(FSkin.Colors.CLR_THEME).darker().darker());
this.setBackground(Singletons.getView().getSkin().getColor(FSkin.Colors.CLR_THEME2));
this.lblName.setFontStyle(Font.BOLD);
this.lblPrice.setFontStyle(Font.BOLD);
this.lblPrice.setFontScaleFactor(0.8);

8
src/main/java/forge/view/home/ViewQuest.java
View File

@@ -87,7 +87,7 @@ public class ViewQuest extends JScrollPane {
// Non-final inits
this.parentView = v0;
this.skin = Singletons.getView().getSkin();
this.clrBorders = skin.getColor(FSkin.Colors.CLR_THEME).darker().darker();
this.clrBorders = skin.getColor(FSkin.Colors.CLR_THEME2);
this.eventPanelConstraints = "w 100%!, h 86px!, gap 0 0 5px 5px";
// Final component inits
@@ -205,7 +205,7 @@ public class ViewQuest extends JScrollPane {
/** Layout and details for Swing components in title panel. */
private void populateTitle() {
pnlTitle.setLayout(new MigLayout("insets 0, gap 0, align center"));
pnlTitle.setBackground(skin.getColor(FSkin.Colors.CLR_THEME).darker());
pnlTitle.setBackground(skin.getColor(FSkin.Colors.CLR_THEME2));
((FRoundedPanel) pnlTitle).setBorderColor(clrBorders);
((FLabel) lblTitle).setFontScaleBy(SwingConstants.HORIZONTAL);
@@ -268,7 +268,7 @@ public class ViewQuest extends JScrollPane {
final FRoundedPanel pnl = new FRoundedPanel();
pnl.setLayout(new MigLayout("insets 0, align center"));
pnl.setBorderColor(clrBorders);
pnl.setBackground(skin.getColor(FSkin.Colors.CLR_THEME));
pnl.setBackground(skin.getColor(FSkin.Colors.CLR_THEME2));
pnl.add(new FLabel("Load a previous Quest"), "h 95%!, gap 0 0 2.5% 0");
final FLabel lbl = new FLabel("To use quest files "
@@ -293,7 +293,7 @@ public class ViewQuest extends JScrollPane {
final FRoundedPanel pnl1 = new FRoundedPanel();
pnl1.setLayout(new MigLayout("insets 0, align center"));
pnl1.setBorderColor(clrBorders);
pnl1.setBackground(skin.getColor(FSkin.Colors.CLR_THEME));
pnl1.setBackground(skin.getColor(FSkin.Colors.CLR_THEME2));
pnl1.add(new FLabel("Start a new quest"), "h 95%!, gap 0 0 2.5% 0");
final ButtonGroup group1 = new ButtonGroup();

3
src/main/java/forge/view/toolbox/FSkin.java
View File

@@ -64,7 +64,8 @@ public class FSkin {
CLR_PHASE_INACTIVE_ENABLED (new int[] {70, 150}), /** */
CLR_PHASE_INACTIVE_DISABLED (new int[] {70, 170}), /** */
CLR_PHASE_ACTIVE_ENABLED (new int[] {70, 190}), /** */
CLR_PHASE_ACTIVE_DISABLED (new int[] {70, 210});
CLR_PHASE_ACTIVE_DISABLED (new int[] {70, 210}), /** */
CLR_THEME2 (new int[] {70, 230});
private int[] coords;
/** @param xy   int[] coordinates */