From 0c6ae26e932c0ab98f372afee2f7951397eb66c1 Mon Sep 17 00:00:00 2001
From: bMorgan17 <27574085+bMorgan17@users.noreply.github.com>
Date: Mon, 19 Aug 2019 19:48:30 -0600
Subject: [PATCH] fixed ...

---
 Main.java          | 16 ++++++++--------
 compilerRunner.bat |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Main.java b/Main.java
index 131d083..f84cb24 100644
--- a/Main.java
+++ b/Main.java
@@ -54,6 +54,9 @@ public class Main {
             ex.printStackTrace();
         }*/
 
+        rows = r;
+        cols = c;
+
         timerLabel = new JLabel(String.format("%04d:%02d:%02d.%03d", 0, 0, 0, 0));
 
         gameTimer = new Timer(100, new ActionListener() {
@@ -85,11 +88,11 @@ public class Main {
         player2.setText(name2 + ": 0");
 
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        screenSize = new Dimension((int)((((screenSize.getHeight()*4)/5)/r)*2)/3, (int)((screenSize.getHeight()*4)/5)/r);
+        screenSize = new Dimension((int)((((screenSize.getHeight()*4)/5)/rows)*2)/3, (int)((screenSize.getHeight()*4)/5)/rows);
 
-        if (Toolkit.getDefaultToolkit().getScreenSize().getWidth() < ((c * screenSize.getWidth()) + ((c + 1) * 5))) {
+        if (Toolkit.getDefaultToolkit().getScreenSize().getWidth() < ((cols * screenSize.getWidth()) + ((cols + 1) * 5))) {
             screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-            screenSize = new Dimension((int)((screenSize.getWidth()*5)/6)/c, (int)((((screenSize.getWidth()*5)/6)/c)*3)/2);
+            screenSize = new Dimension((int)((screenSize.getWidth()*5)/6)/cols, (int)((((screenSize.getWidth()*5)/6)/cols)*3)/2);
         }
 
         int fontSize;
@@ -105,9 +108,6 @@ public class Main {
 
         Font useFont = new Font(testFont.getFont().getName(), Font.PLAIN, fontSize);
 
-        rows = r;
-        cols = c;
-
         panels = new JPanel[rows][cols];
         btns = new JButton[rows][cols];
         labels = new JLabel[rows][cols];
@@ -273,10 +273,10 @@ public class Main {
         GridBagConstraints gbc = new GridBagConstraints();
         gbc.gridy = 0;
 
-        frame.add(infoPanel, c);
+        frame.add(infoPanel, gbc);
         gbc.gridy = 1;
 
-        frame.add(panel, c);
+        frame.add(panel, gbc);
         frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
         frame.pack();
         frame.setVisible(true);
diff --git a/compilerRunner.bat b/compilerRunner.bat
index 6843d80..9e222c9 100644
--- a/compilerRunner.bat
+++ b/compilerRunner.bat
@@ -1,8 +1,8 @@
 javac -source 1.7 -target 1.7 *.java
-IF EXIST Calc.jar DEL /F Calc.jar
-jar cfm Calc.jar manifest.txt *.class
+IF EXIST Memory.jar DEL /F Memory.jar
+jar cfm Memory.jar manifest.txt *.class
 echo off
 DEL /F *.class
 DEL /F *.ctxt
 cls
-java -jar Calc.jar
\ No newline at end of file
+java -jar Memory.jar
\ No newline at end of file