2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-03 00:37:55 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge pull request #60 from CapslockRSPS/master

Browse Source 
[TASK] Assigned new fonts to old settings
This commit is contained in:
Jeroen Ketelaar
2016-04-28 03:41:59 +02:00
parent d4b2a19d98 bb4dbf78fb
commit 5364ab2c1c
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/parabot/core/ui/components/ServerComponent.java
+3 -2
View File
@@ -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();
src/main/java/org/parabot/core/ui/components/VerboseLoader.java
+1 -5
View File
@@ -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);
}