jashton/dnd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

race GUI refactored, making minor adjustments/tweaks to components

Browse Source
This commit is contained in:
Josh Ashton
2022-11-15 17:39:32 -07:00
parent 31384565fc
commit f07b131125
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dndBuilder/src/GUI/PanelTheme.java
+13
View File
@@ -0,0 +1,13 @@
package GUI;
import java.awt.*;
public interface PanelTheme {
public Color deepRed = new Color(165, 42, 42);
public Color lightBrown = new Color(222, 184, 135);
public Color darkBrown = new Color(205, 133, 63);
public Color black = new Color(0, 0, 0);
}
dndBuilder/src/GUI/Panels/ChooseRacePanel.java
+8 -8
View File
@@ -1,5 +1,6 @@
package GUI.Panels; package GUI.Panels;
import GUI.PanelTheme;
import GUI.Panels.SubPanels.*; import GUI.Panels.SubPanels.*;
import java.awt.*; import java.awt.*;
@@ -7,7 +8,7 @@ import java.awt.*;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.*; import javax.swing.border.*;
public class ChooseRacePanel extends JPanel { public class ChooseRacePanel extends JPanel implements PanelTheme {
private String[] raceOptions; private String[] raceOptions;
@@ -70,10 +71,10 @@ public class ChooseRacePanel extends JPanel {
private JPanel createRaceButtonPanel() { private JPanel createRaceButtonPanel() {
JPanel raceBtnPanel = new JPanel(); JPanel raceBtnPanel = new JPanel(new GridLayout(raceOptions.length, 1, 15, 5));
raceBtnPanel.setBackground(new Color(165, 42, 42)); raceBtnPanel.setBackground(darkBrown);
raceBtnPanel.setBorder(new BevelBorder(BevelBorder.LOWERED, null, null, null, null)); raceBtnPanel.setBounds(311, 6, 109, 394);
raceBtnPanel.setBounds(311, 6, 409, 394);
for (int i = 0; i < raceOptions.length; i++) { for (int i = 0; i < raceOptions.length; i++) {
@@ -87,8 +88,7 @@ public class ChooseRacePanel extends JPanel {
private void panelSetup() { private void panelSetup() {
setBackground(new Color(222, 184, 135)); setBackground(lightBrown);
setBorder(new BevelBorder(BevelBorder.RAISED, new Color(160, 82, 45), new Color(165, 42, 42), new Color(0, 0, 0), null));
setLayout(new BorderLayout(0, 0)); setLayout(new BorderLayout(0, 0));
} }
@@ -96,7 +96,7 @@ public class ChooseRacePanel extends JPanel {
private JPanel createNavPanel() { private JPanel createNavPanel() {
JPanel panel = new JPanel(); JPanel panel = new JPanel();
panel.setBackground(new Color(205, 133, 63)); panel.setBackground(darkBrown);
panel.add(backButton); panel.add(backButton);
panel.add(continueButton); panel.add(continueButton);
dndBuilder/src/GUI/Panels/SubPanels/InfoPanel.java
+4 -3
View File
@@ -1,5 +1,7 @@
package GUI.Panels.SubPanels; package GUI.Panels.SubPanels;
import GUI.PanelTheme;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.BevelBorder; import javax.swing.border.BevelBorder;
@@ -9,7 +11,7 @@ import java.io.File;
import java.util.Objects; import java.util.Objects;
import java.util.Random; import java.util.Random;
public class InfoPanel extends JPanel { public class InfoPanel extends JPanel implements PanelTheme {
private JTextArea[] descriptions; private JTextArea[] descriptions;
private String[] holderDescriptions; private String[] holderDescriptions;
@@ -75,7 +77,6 @@ public class InfoPanel extends JPanel {
private void panelSetup() { private void panelSetup() {
setOpaque(false); setOpaque(false);
setBorder(new BevelBorder(BevelBorder.LOWERED, null, null, null, null));
setBounds(6, 6, 293, 394); setBounds(6, 6, 293, 394);
setLayout(null); setLayout(null);
@@ -159,7 +160,7 @@ public class InfoPanel extends JPanel {
portraits[i][index] = image(file); portraits[i][index] = image(file);
portraits[i][index].setOpaque(true); portraits[i][index].setOpaque(true);
portraits[i][index].setBackground(new Color(238, 232, 170)); portraits[i][index].setBackground(lightBrown);
portraits[i][index].setBounds(6, 229, 281, 159); portraits[i][index].setBounds(6, 229, 281, 159);
index++; index++;