From bb4dbf78fb5ddb1c5dcf622570359fee149ca2c2 Mon Sep 17 00:00:00 2001 From: Emmastone Date: Thu, 28 Apr 2016 02:34:20 +0100 Subject: [PATCH] [TASK] Assigned new fonts to old settings --- .../org/parabot/core/ui/components/ServerComponent.java | 5 +++-- .../java/org/parabot/core/ui/components/VerboseLoader.java | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/parabot/core/ui/components/ServerComponent.java b/src/main/java/org/parabot/core/ui/components/ServerComponent.java index ee38480..7fa9c83 100644 --- a/src/main/java/org/parabot/core/ui/components/ServerComponent.java +++ b/src/main/java/org/parabot/core/ui/components/ServerComponent.java @@ -13,6 +13,7 @@ import java.awt.event.MouseMotionListener; import javax.swing.JPanel; import org.parabot.core.desc.ServerDescription; +import org.parabot.core.ui.fonts.Fonts; import org.parabot.environment.Environment; /** @@ -61,13 +62,13 @@ public class ServerComponent extends JPanel implements MouseListener, g2d.setColor(bgColor); g2d.fillRect(0, 0, w, h); g.setColor(Color.black); - Font title = new Font("Arial", Font.BOLD, 16); + Font title = Fonts.getResource("leelawadee.ttf", 16); g.setFont(title); String serverName = desc.getServerName(); int sw = g.getFontMetrics().stringWidth(serverName); g.drawString(serverName, (w / 2) - (sw / 2), 30); - Font normal = new Font("Arial", Font.PLAIN, 12); + Font normal = Fonts.getResource("leelawadee.ttf"); g.setFont(normal); FontMetrics fm = g.getFontMetrics(); String author = "Author: " + desc.getAuthor(); diff --git a/src/main/java/org/parabot/core/ui/components/VerboseLoader.java b/src/main/java/org/parabot/core/ui/components/VerboseLoader.java index 5cce1a0..c08e9a5 100755 --- a/src/main/java/org/parabot/core/ui/components/VerboseLoader.java +++ b/src/main/java/org/parabot/core/ui/components/VerboseLoader.java @@ -225,10 +225,6 @@ public class VerboseLoader extends JPanel implements ProgressListener { } if (currentState == STATE_AUTHENTICATION) { - /*g.setColor(new Color(74, 74, 72, 100)); - g.fillRect(loginPanel.getX() - 10, loginPanel.getY(), loginPanel.getWidth() + 20, loginPanel.getHeight()); - g.setColor(Color.black); - g.drawRect(loginPanel.getX() - 10, loginPanel.getY(), loginPanel.getWidth() + 20, loginPanel.getHeight());*/ g.drawImage(loginBox, loginPanel.getX() - 30, loginPanel.getY() - 22, null); } @@ -236,7 +232,7 @@ public class VerboseLoader extends JPanel implements ProgressListener { if (currentState == STATE_LOADING) { progressBar.draw(g, (getWidth() / 2) - 200, 220); - g.setFont(new Font("Times New Roman", Font.PLAIN, 14)); + g.setFont(Fonts.getResource("leelawadee.ttf")); int x = (getWidth() / 2) - (fontMetrics.stringWidth(state) / 2); g.drawString(state, x, 200); }