Merge pull request #115 from CSC207-2022F-UofT/change_table_font

[*] Changed the font of the table to Microsoft YaHei UI
CSC207-2022F-UofT · Dec 8, 2022 · f0e624e · f0e624e
2 parents 5f792b9 + 9df56e0
commit f0e624e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/billgates/view/gui/FontSettings.java b/src/main/java/billgates/view/gui/FontSettings.java
@@ -10,7 +10,7 @@
 public class FontSettings extends Font{
 
     public FontSettings(int fontSize) {
-        super("微软雅黑", Font.BOLD, fontSize);
+        super("Microsoft YaHei UI", Font.BOLD, fontSize);
     }
 
     // Add a new constructor to change font later, with parameter of font and font size

diff --git a/src/main/java/billgates/view/gui/TopMenuBar.java b/src/main/java/billgates/view/gui/TopMenuBar.java
@@ -29,7 +29,7 @@ public class TopMenuBar extends JMenuBar {
     private final static Color[] COLORS = new Color[]{new Color(240, 140, 170), Color.RED,
             Color.ORANGE, Color.YELLOW, Color.GREEN, Color.CYAN, Color.BLUE, Color.PINK, Color.WHITE
     };
-    private final static String[] FONTS = new String[]{"微软雅黑", "Tahoma", "Times New Roman",
+    private final static String[] FONTS = new String[]{"Microsoft YaHei UI", "Tahoma", "Times New Roman",
             "Helvetica", "Arial", "Impact", "Verdana", "Century", "Copperplate"};
     private final JMenu fileMenu = new GeneralMenu("File");
     private final JMenu settingsMenu = new GeneralMenu("Settings");