Merge branch 'hai' into 'master'

fixed GUI layout

See merge request 1050369/comp90015-dsass2-infinitymonkeys-remaster!41

src/GUI/DrawingArea.java

@@ -94,6 +94,8 @@ public class DrawingArea extends JPanel implements MouseMotionListener, MouseLis
     public void clear() {
 
         image = new BufferedImage(AREA_WIDTH, AREA_HEIGHT, BufferedImage.TYPE_INT_ARGB);
+        g2 = (Graphics2D) image.getGraphics();
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         repaint();
 
     }

src/GUI/PaintGUI.java

 package GUI;
 
 import client.Client;
-import remote.IDrawingUpdate;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
@@ -107,7 +106,7 @@ public class PaintGUI extends JPanel {
         //        setFontBtn = new JButton("Font");
 //        setFontBtn.addActionListener(actionListener);
         textInput = new JTextField("Text here.");
-        textInput.setColumns(8);
+        textInput.setColumns(13);
         textInput.addFocusListener(focusListener);
 //        textInput.setVisible(false);
         textSize = new JTextField("12");
@@ -409,7 +408,13 @@ public class PaintGUI extends JPanel {
 
     private void setTextDetail() {
         String textString = textInput.getText();
-        int size = Integer.parseInt(textSize.getText());
+        int size = 12;  // default
+        if (!textSize.getText().isEmpty()) {
+            size = Integer.parseInt(textSize.getText());
+        }
+        else {
+            textSize.setText(Integer.toString(size));
+        }
 
         drawingArea.setModeText(textString, size);
     }