From 314f45dc79c0887de27d050c174d44ca2c1e230c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Mon, 8 Jul 2019 22:26:28 +0200 Subject: [PATCH] fontmanager: Change font on panels --- .../client/plugins/equipmentinspector/ItemPanel.java | 2 +- .../net/runelite/client/plugins/profiles/ProfilesPanel.java | 6 +++--- .../net/runelite/client/plugins/slayer/SlayerTaskPanel.java | 4 ++-- .../client/plugins/stonedloottracker/ui/ItemPanel.java | 2 +- .../client/plugins/stonedloottracker/ui/LootTrackerBox.java | 6 +++--- .../plugins/suppliestracker/SuppliesTrackerPanel.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java index 20f1c2f9be..684cb8ab31 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java @@ -49,7 +49,7 @@ class ItemPanel extends JPanel JLabel name = new JLabel(item.getName()); JLabel location = new JLabel(StringUtils.capitalize(kitType.toString().toLowerCase())); - location.setFont(FontManager.getRunescapeSmallFont()); + location.setFont(FontManager.getSmallFont(getFont())); JLabel imageLabel = new JLabel(); icon.addTo(imageLabel); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java index 60835272a2..28b554e6f2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java @@ -77,8 +77,8 @@ class ProfilesPanel extends PluginPanel private static final String ACCOUNT_LABEL = "Account Label"; private static final String PASSWORD_LABEL = "Account Password"; private static final String HELP = "To add and load accounts, first enter a password into the Encryption Password " + - "field then press Load Accounts. You can now add as many accounts as you would like. The next time you restart" + - "Runelite, enter your encryption password and click load accounts to see the accounts you entered"; + "field then press Load Accounts. You can now add as many accounts as you would like. The next time you restart " + + "RunelitePlus, enter your encryption password and click load accounts to see the accounts you entered"; private static final Dimension PREFERRED_SIZE = new Dimension(PluginPanel.PANEL_WIDTH - 20, 30); private static final Dimension HELP_PREFERRED_SIZE = new Dimension(PluginPanel.PANEL_WIDTH - 20, 130); @@ -116,7 +116,7 @@ class ProfilesPanel extends PluginPanel JPanel helpPanel = new JPanel(new BorderLayout()); helpPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR); JLabel helpLabel = new JLabel("

" + HELP + "

"); - helpLabel.setFont(FontManager.getRunescapeSmallFont()); + helpLabel.setFont(FontManager.getSmallFont(getFont())); helpPanel.setPreferredSize(HELP_PREFERRED_SIZE); // helpPanel.setSize(MINIMUM_SIZE); helpPanel.add(helpLabel, BorderLayout.NORTH); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java index f865237fe9..d9eb0d0065 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java @@ -195,8 +195,8 @@ public class SlayerTaskPanel extends PluginPanel overallInfo.setBackground(ColorScheme.DARKER_GRAY_COLOR); overallInfo.setLayout(new GridLayout(2, 1)); overallInfo.setBorder(new EmptyBorder(2, 10, 2, 0)); - overallKillsLabel.setFont(FontManager.getRunescapeSmallFont()); - overallTimeLabel.setFont(FontManager.getRunescapeSmallFont()); + overallKillsLabel.setFont(FontManager.getSmallFont(getFont())); + overallTimeLabel.setFont(FontManager.getSmallFont(getFont())); overallInfo.add(overallKillsLabel); overallInfo.add(overallTimeLabel); overallPanel.add(overallIcon, BorderLayout.WEST); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java index b7e01d00a8..aa4947c9e3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java @@ -91,7 +91,7 @@ class ItemPanel extends JPanel } JShadowedLabel labelValue = new JShadowedLabel(gpLabel); - labelValue.setFont(FontManager.getRunescapeSmallFont()); + labelValue.setFont(FontManager.getSmallFont(getFont())); colorLabel(labelValue, this.record.getTotal()); labelValue.setVerticalAlignment(SwingUtilities.TOP); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java index 9618536cc0..3008f2d421 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java @@ -80,12 +80,12 @@ class LootTrackerBox extends JPanel logTitle.setBackground(ColorScheme.DARKER_GRAY_COLOR.darker()); final JLabel titleLabel = new JLabel(Text.removeTags(id)); - titleLabel.setFont(FontManager.getRunescapeSmallFont()); + titleLabel.setFont(FontManager.getSmallFont(getFont())); titleLabel.setForeground(Color.WHITE); logTitle.add(titleLabel, BorderLayout.WEST); - subTitleLabel.setFont(FontManager.getRunescapeSmallFont()); + subTitleLabel.setFont(FontManager.getSmallFont(getFont())); subTitleLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR); logTitle.add(subTitleLabel, BorderLayout.CENTER); @@ -94,7 +94,7 @@ class LootTrackerBox extends JPanel subTitleLabel.setText(subtitle); } - priceLabel.setFont(FontManager.getRunescapeSmallFont()); + priceLabel.setFont(FontManager.getSmallFont(getFont())); priceLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR); logTitle.add(priceLabel, BorderLayout.EAST); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java index 088d2421b5..983587c50c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java @@ -90,8 +90,8 @@ class SuppliesTrackerPanel extends PluginPanel overallInfo.setBackground(ColorScheme.DARKER_GRAY_COLOR); overallInfo.setLayout(new GridLayout(2, 1)); overallInfo.setBorder(new EmptyBorder(0, 10, 0, 0)); - overallSuppliesUsedLabel.setFont(FontManager.getRunescapeSmallFont()); - overallCostLabel.setFont(FontManager.getRunescapeSmallFont()); + overallSuppliesUsedLabel.setFont(FontManager.getSmallFont(getFont())); + overallCostLabel.setFont(FontManager.getSmallFont(getFont())); overallInfo.add(overallSuppliesUsedLabel); overallInfo.add(overallCostLabel); overallPanel.add(overallIcon, BorderLayout.WEST);