diff --git a/out/production/Tetris/Tetris/Board$1.class b/out/production/Tetris/Tetris/Board$1.class index 9671a62..ca89719 100644 Binary files a/out/production/Tetris/Tetris/Board$1.class and b/out/production/Tetris/Tetris/Board$1.class differ diff --git a/out/production/Tetris/Tetris/Board.class b/out/production/Tetris/Tetris/Board.class index c34a9ba..5586889 100644 Binary files a/out/production/Tetris/Tetris/Board.class and b/out/production/Tetris/Tetris/Board.class differ diff --git a/out/production/Tetris/Tetris/GameGui.class b/out/production/Tetris/Tetris/GameGui.class index 18a6a5f..cab6a8b 100644 Binary files a/out/production/Tetris/Tetris/GameGui.class and b/out/production/Tetris/Tetris/GameGui.class differ diff --git a/src/Tetris/Board.java b/src/Tetris/Board.java index c7362e2..2315392 100644 --- a/src/Tetris/Board.java +++ b/src/Tetris/Board.java @@ -13,8 +13,6 @@ public class Board extends JPanel public static final int BOARD_HEIGHT=20; public static final int BLOCK_SIZE=30; - public static final int BOARDRIGHT_WIDTH=15; - public static final int BOARDRIGHT_HEIGHT=5; private Timer loop; private Color[][] board = new Color[BOARD_WIDTH][BOARD_HEIGHT]; private Color[] [] shape ={ diff --git a/src/Tetris/GameGui.java b/src/Tetris/GameGui.java index b44d13d..565cee3 100644 --- a/src/Tetris/GameGui.java +++ b/src/Tetris/GameGui.java @@ -2,26 +2,30 @@ package Tetris; import javax.swing.*; import java.awt.*; - public class GameGui { public static final int width= 500, height =650; private Board board; - private Board board2; private JFrame frame; public GameGui(){ - frame = new JFrame("Tetris"); JPanel panel = new JPanel(); - panel.setBorder(BorderFactory.createMatteBorder(450, 50, 50, 50,Color.black)); - JButton button1 = new JButton("Start"); - JButton button2 = new JButton("Pause"); + panel.setBorder(BorderFactory.createMatteBorder(450, 10, 20, 10,Color.black)); + JLabel label = new JLabel("Name: ",JLabel.LEFT); + label.setBounds(100,100,50,30); + JButton button1 = new JButton("Start"); + + button1.setPreferredSize( new Dimension(150,150)); + JButton button2 = new JButton("Pause"); + JButton button3 = new JButton("Score"); panel.setLayout(new GridLayout(0,1)); - panel.setBackground(Color.DARK_GRAY); + panel.setBackground(Color.gray); + panel.add(label); panel.add(button1); panel.add(button2); + panel.add(button3); /* window.add(panel, BorderLayout.EAST); frame.add(window,BorderLayout.WEST); @@ -33,7 +37,7 @@ public class GameGui { board = new Board(); window.add(board); */ - + frame = new JFrame("Tetris"); frame.add(panel,BorderLayout.EAST); frame.setSize(width,height); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); @@ -41,8 +45,6 @@ public class GameGui { frame.setVisible(true); board = new Board(); frame.add(board,BorderLayout.CENTER); - board2 = new Board(); - frame.add(board2,BorderLayout.EAST); } public static void main(String [] args) {