From 7781660c113837498eaa42a53a4003c2681e42f3 Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Mon, 24 Sep 2018 17:29:42 -0600 Subject: [PATCH] make font sizes relative to default (12) Signed-off-by: Jamin W. Collins --- .../java/forge/deckchooser/DecksComboBox.java | 2 +- .../java/forge/download/GuiDownloader.java | 2 +- .../forge/itemmanager/filters/ItemFilter.java | 2 +- .../forge/itemmanager/views/ImageView.java | 2 +- .../forge/itemmanager/views/ItemListView.java | 2 +- .../deckeditor/AddBasicLandsDialog.java | 2 +- .../java/forge/screens/home/LblGroup.java | 2 +- .../java/forge/screens/home/LblHeader.java | 2 +- .../java/forge/screens/home/LblMenuItem.java | 2 +- .../java/forge/screens/home/PlayerPanel.java | 2 +- .../home/gauntlet/VSubmenuGauntletQuick.java | 2 +- .../home/online/VSubmenuOnlineLobby.java | 2 +- .../screens/home/quest/PnlDraftEvent.java | 6 ++-- .../forge/screens/home/quest/PnlEvent.java | 4 +-- .../home/quest/VSubmenuQuestPrefs.java | 2 +- .../forge/screens/home/quest/ViewStall.java | 2 +- .../home/sanctioned/VSubmenuSealed.java | 2 +- .../home/settings/VSubmenuAchievements.java | 10 +++--- .../home/settings/VSubmenuPreferences.java | 8 ++--- .../home/settings/VSubmenuReleaseNotes.java | 2 +- .../forge/screens/match/LimitedWinLose.java | 4 +-- .../java/forge/screens/match/ViewWinLose.java | 16 +++++----- .../forge/screens/match/views/VPrompt.java | 4 +-- .../forge/screens/match/views/VStack.java | 2 +- .../java/forge/toolbox/FComboBoxPanel.java | 4 +-- .../src/main/java/forge/toolbox/FSkin.java | 31 ++++++++++++++++++- .../main/java/forge/toolbox/FTextEditor.java | 2 +- .../main/java/forge/view/FNavigationBar.java | 4 +-- .../src/main/java/forge/view/FTitleBar.java | 2 +- .../src/main/java/forge/view/FView.java | 2 +- 30 files changed, 80 insertions(+), 51 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java b/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java index 3d40e0efac1..1f59867d680 100644 --- a/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java +++ b/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java @@ -20,7 +20,7 @@ public class DecksComboBox extends FComboBoxWrapper { private DeckType selectedDeckType = null; public DecksComboBox() { - setSkinFont(FSkin.getBoldFont(14)); + setSkinFont(FSkin.getRelativeBoldFont(14)); setTextAlignment(TextAlignment.CENTER); addActionListener(getDeckTypeComboListener()); } diff --git a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java index b7342dffed0..35c2ac36bfd 100644 --- a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java +++ b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java @@ -90,7 +90,7 @@ public class GuiDownloader extends DefaultBoundedRangeModel { radProxyNone.setSelected(true); btnClose.setBorder(new FSkin.LineSkinBorder(FSkin.getColor(FSkin.Colors.CLR_TEXT))); - btnStart.setFont(FSkin.getFont(18)); + btnStart.setFont(FSkin.getRelativeFont(18)); btnStart.setEnabled(false); progressBar.reset(); diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ItemFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ItemFilter.java index da5c74e9df5..8837618a8be 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ItemFilter.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ItemFilter.java @@ -27,7 +27,7 @@ public abstract class ItemFilter { public static void layoutCheckbox(SkinnedCheckBox cb) { cb.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); - cb.setFont(FSkin.getFont(12)); + cb.setFont(FSkin.getFont()); cb.setOpaque(false); cb.setFocusable(false); } diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java index 1bc5d5a8cc6..d5833b4f2c0 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java @@ -63,7 +63,7 @@ public class ImageView extends ItemView { private static final float PILE_SPACING_Y = 0.1f; private static final SkinColor GROUP_HEADER_FORE_COLOR = FSkin.getColor(FSkin.Colors.CLR_TEXT); private static final SkinColor GROUP_HEADER_LINE_COLOR = GROUP_HEADER_FORE_COLOR.alphaColor(120); - private static final SkinFont GROUP_HEADER_FONT = FSkin.getFont(12); + private static final SkinFont GROUP_HEADER_FONT = FSkin.getFont(); private static final int GROUP_HEADER_HEIGHT = 19; private static final int GROUP_HEADER_GLYPH_WIDTH = 6; private static final int MIN_COLUMN_COUNT = 1; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java index 58c7163196c..855e2c8250c 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java @@ -103,7 +103,7 @@ public final class ItemListView extends ItemView { static final SkinColor ALT_ROW_COLOR = BACK_COLOR.getContrastColor(-20); private static final SkinColor GRID_COLOR = BACK_COLOR.getContrastColor(20); private static final SkinBorder HEADER_BORDER = new FSkin.CompoundSkinBorder(new FSkin.MatteSkinBorder(0, 0, 1, 1, GRID_COLOR), new EmptyBorder(0, 1, 0, 0)); - private static final SkinFont ROW_FONT = FSkin.getFont(12); + private static final SkinFont ROW_FONT = FSkin.getFont(); private static final int ROW_HEIGHT = 19; private final ItemTable table = new ItemTable(); diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java index 8190f7e00bd..7b0dbe9978b 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java @@ -103,7 +103,7 @@ public class AddBasicLandsDialog { panel.add(pnlForest); panel.add(lblDeckInfo); - lblDeckInfo.setFont(FSkin.getFont(14)); + lblDeckInfo.setFont(FSkin.getRelativeFont(14)); lblDeckInfo.addMouseListener(new FMouseAdapter() { @Override public void onLeftDoubleClick(MouseEvent e) { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java b/forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java index 3f8c25273c2..69f92f1353d 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java @@ -38,7 +38,7 @@ public class LblGroup extends SkinnedLabel implements ILocalRepaint { public LblGroup(final EMenuGroup e0) { super(" " + e0.getTitle()); - this.setFont(FSkin.getBoldFont(14)); + this.setFont(FSkin.getRelativeBoldFont(14)); this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); this.addMouseListener(new MouseAdapter() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/LblHeader.java b/forge-gui-desktop/src/main/java/forge/screens/home/LblHeader.java index a7dd78a9d06..80780ed9cc5 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/LblHeader.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/LblHeader.java @@ -25,7 +25,7 @@ public class LblHeader extends SkinnedLabel { public LblHeader(final String txt0) { super(txt0); this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); - this.setFont(FSkin.getFont(18)); + this.setFont(FSkin.getRelativeFont(18)); this.setBorder(new EmptyBorder(5, 30, 0, 0)); } diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/LblMenuItem.java b/forge-gui-desktop/src/main/java/forge/screens/home/LblMenuItem.java index 2208eb93a55..0c504a3d96f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/LblMenuItem.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/LblMenuItem.java @@ -36,7 +36,7 @@ public class LblMenuItem extends SkinnedLabel implements ILocalRepaint { public LblMenuItem(final IVSubmenu doc0) { super(" " + doc0.getMenuTitle()); - this.setFont(FSkin.getFont(14)); + this.setFont(FSkin.getRelativeFont(14)); this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); this.addMouseListener(new MouseAdapter() { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java index 875da3c0689..2068e3a4f05 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java @@ -663,7 +663,7 @@ public class PlayerPanel extends FPanel { txtPlayerName.setText(name); txtPlayerName.setFocusable(true); - txtPlayerName.setFont(FSkin.getFont(14)); + txtPlayerName.setFont(FSkin.getRelativeFont(14)); txtPlayerName.addActionListener(lobby.nameListener); txtPlayerName.addFocusListener(nameFocusListener); } diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java index d01810b33d0..d3b7d0f2084 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java @@ -107,7 +107,7 @@ public enum VSubmenuGauntletQuick implements IVSubmenu { sliOpponents.setSnapToTicks(true); sliOpponents.setOpaque(false); sliOpponents.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); - sliOpponents.setFont(FSkin.getFont(12)); + sliOpponents.setFont(FSkin.getFont()); pnlOptions.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); pnlOptions.add(lblOptions, "h 30px!, w 96%!, gap 2% 0 0 5px"); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java index 759d36b7bd2..f589f204c7d 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java @@ -64,7 +64,7 @@ public enum VSubmenuOnlineLobby implements IVSubmenu, IOnli if (lobby == null) { final FButton btnConnect = new FButton("Connect to Server"); - btnConnect.setFont(FSkin.getFont(20)); + btnConnect.setFont(FSkin.getRelativeFont(20)); btnConnect.addActionListener(new ActionListener() { @Override public final void actionPerformed(final ActionEvent e) { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlDraftEvent.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlDraftEvent.java index d320a394c17..6fe76f89de2 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlDraftEvent.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlDraftEvent.java @@ -27,17 +27,17 @@ public class PnlDraftEvent extends JPanel { super(); radButton = new FRadioButton(event.getTitle()); - radButton.setFont(FSkin.getBoldFont(20)); + radButton.setFont(FSkin.getRelativeBoldFont(20)); radButton.setIconTextGap(10); final FTextArea eventBoosters = new FTextArea(); final FTextArea eventFee = new FTextArea(); eventBoosters.setText(event.getBoosterList()); - eventBoosters.setFont(FSkin.getFont(12)); + eventBoosters.setFont(FSkin.getFont()); eventFee.setText(QuestUtil.formatCredits(event.getEntryFee()) + " Credit Entry Fee"); - eventFee.setFont(FSkin.getFont(12)); + eventFee.setFont(FSkin.getFont()); radButton.addChangeListener(new ChangeListener() { @Override diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlEvent.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlEvent.java index af0963e4dda..96b4d20336c 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlEvent.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlEvent.java @@ -56,11 +56,11 @@ class PnlEvent extends JPanel { // Title and description this.rad = new FRadioButton(event.getFullTitle()); - this.rad.setFont(FSkin.getBoldFont(16)); + this.rad.setFont(FSkin.getRelativeBoldFont(16)); final FTextArea tarDesc = new FTextArea(); tarDesc.setText(event.getDescription()); - tarDesc.setFont(FSkin.getItalicFont(12)); + tarDesc.setFont(FSkin.getItalicFont()); tarDesc.addMouseListener(new MouseAdapter() { @Override diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java index 2f3c2c66a82..0f56c273032 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java @@ -509,7 +509,7 @@ public enum VSubmenuQuestPrefs implements IVSubmenu { this.setOpaque(false); this.setBorder((Border)null); - this.setFont(FSkin.getFont(13)); + this.setFont(FSkin.getRelativeFont(13)); this.setForeground(clrText); this.setCaretColor(clrText); this.setBackground(clrHover); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewStall.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewStall.java index 9f3da1afc43..0eb32eff473 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewStall.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewStall.java @@ -80,7 +80,7 @@ public class ViewStall extends JPanel { this.tpnFluff.setOpaque(false); this.tpnFluff.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); - this.tpnFluff.setFont(FSkin.getItalicFont(15)); + this.tpnFluff.setFont(FSkin.getRelativeItalicFont(15)); this.tpnFluff.setFocusable(false); this.tpnFluff.setEditable(false); this.tpnFluff.setBorder((Border)null); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java index f9bdc4dea6f..486d16860c9 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java @@ -193,7 +193,7 @@ public enum VSubmenuSealed implements IVSubmenu { final SkinnedTextPane tpnDirections = new SkinnedTextPane(); tpnDirections.setOpaque(false); tpnDirections.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); - tpnDirections.setFont(FSkin.getFont(15)); + tpnDirections.setFont(FSkin.getRelativeFont(15)); tpnDirections.setAlignmentX(SwingConstants.CENTER); tpnDirections.setFocusable(false); tpnDirections.setEditable(false); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java index 361b27c1ab8..bd5e3fc31d2 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java @@ -48,8 +48,8 @@ public enum VSubmenuAchievements implements IVSubmenu { private static final int TROPHIES_PER_SHELVE = 4; private static final int PADDING = 5; private static final int TROPHY_PADDING = 45; - private static final SkinFont NAME_FONT = FSkin.getBoldFont(14); - private static final SkinFont DESC_FONT = FSkin.getFont(12); + private static final SkinFont NAME_FONT = FSkin.getRelativeBoldFont(14); + private static final SkinFont DESC_FONT = FSkin.getFont(); private static final SkinColor TEXT_COLOR = FSkin.getColor(Colors.CLR_TEXT); private static final SkinColor NOT_EARNED_COLOR = TEXT_COLOR.alphaColor(128); private static final SkinColor TEXTURE_OVERLAY_COLOR = FSkin.getColor(Colors.CLR_THEME); @@ -121,7 +121,7 @@ public enum VSubmenuAchievements implements IVSubmenu { AchievementCollection.buildComboBox(cbCollections); - cbCollections.setSkinFont(FSkin.getBoldFont(14)); + cbCollections.setSkinFont(FSkin.getRelativeBoldFont(14)); cbCollections.setTextAlignment(TextAlignment.CENTER); cbCollections.addActionListener(new ActionListener() { @Override @@ -264,8 +264,8 @@ public enum VSubmenuAchievements implements IVSubmenu { private static final SkinImage imgTop = FSkin.getImage(FSkinProp.IMG_TROPHY_CASE_TOP); private static final SkinImage imgShelf = FSkin.getImage(FSkinProp.IMG_TROPHY_SHELF); private static final SkinImage imgTrophyPlate = FSkin.getImage(FSkinProp.IMG_TROPHY_PLATE); - private static final Font font = FSkin.getFixedFont(14).deriveFont(Font.BOLD); - private static final Font subFont = FSkin.getFixedFont(12); + private static final Font font = FSkin.getRelativeFixedFont(14).deriveFont(Font.BOLD); + private static final Font subFont = FSkin.getFixedFont(); private static final Color foreColor = new Color(239, 220, 144); private AchievementCollection achievements; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java index 40a96099df4..572c9a36edb 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java @@ -391,7 +391,7 @@ public enum VSubmenuPreferences implements IVSubmenu { private final class OptionsCheckBox extends FCheckBox { private OptionsCheckBox(final String txt0) { super(txt0); - this.setFont(FSkin.getBoldFont(12)); + this.setFont(FSkin.getBoldFont()); } } @@ -402,7 +402,7 @@ public enum VSubmenuPreferences implements IVSubmenu { super(txt0); this.setBorder(new FSkin.MatteSkinBorder(0, 0, 1, 0, FSkin.getColor(FSkin.Colors.CLR_BORDERS))); setHorizontalAlignment(SwingConstants.CENTER); - this.setFont(FSkin.getBoldFont(16)); + this.setFont(FSkin.getRelativeBoldFont(16)); this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); } } @@ -412,7 +412,7 @@ public enum VSubmenuPreferences implements IVSubmenu { private final class NoteLabel extends SkinnedLabel { private NoteLabel(final String txt0) { super(txt0); - this.setFont(FSkin.getItalicFont(12)); + this.setFont(FSkin.getItalicFont()); this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); } } @@ -436,7 +436,7 @@ public enum VSubmenuPreferences implements IVSubmenu { public KeyboardShortcutField(final Shortcut shortcut0) { super(); this.setEditable(false); - this.setFont(FSkin.getFont(14)); + this.setFont(FSkin.getRelativeFont(14)); final FPref prefKey = shortcut0.getPrefKey(); reload(prefKey); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuReleaseNotes.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuReleaseNotes.java index 4ff741dd106..ce5f59a28e3 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuReleaseNotes.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuReleaseNotes.java @@ -60,7 +60,7 @@ public enum VSubmenuReleaseNotes implements IVSubmenu { tar.setEditable(false); tar.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - tar.setFont(FSkin.getFixedFont(16)); + tar.setFont(FSkin.getRelativeFixedFont(16)); tar.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); tar.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/LimitedWinLose.java b/forge-gui-desktop/src/main/java/forge/screens/match/LimitedWinLose.java index f8b22a27fe0..58c4f9da476 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/LimitedWinLose.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/LimitedWinLose.java @@ -59,7 +59,7 @@ public class LimitedWinLose extends ControlWinLose { TitleLabel lblTemp1 = new TitleLabel(title); SkinnedLabel lblTemp2 = new SkinnedLabel(message); lblTemp2.setHorizontalAlignment(SwingConstants.CENTER); - lblTemp2.setFont(FSkin.getFont(17)); + lblTemp2.setFont(FSkin.getRelativeFont(17)); lblTemp2.setForeground(FORE_COLOR); lblTemp2.setIconTextGap(50); getView().getPnlCustom().add(lblTemp1, LimitedWinLose.CONSTRAINTS_TITLE); @@ -136,7 +136,7 @@ public class LimitedWinLose extends ControlWinLose { private class TitleLabel extends SkinnedLabel { TitleLabel(final String msg) { super(msg); - setFont(FSkin.getFont(18)); + setFont(FSkin.getRelativeFont(18)); setPreferredSize(new Dimension(200, 40)); setHorizontalAlignment(SwingConstants.CENTER); setForeground(FORE_COLOR); diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java b/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java index b1c681d5b88..0c8c6b0b71c 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java @@ -110,24 +110,24 @@ public class ViewWinLose implements IWinLoseView { lblTitle.setForeground(Color.white); lblTitle.setHorizontalAlignment(SwingConstants.CENTER); - lblTitle.setFont(FSkin.getBoldFont(30)); + lblTitle.setFont(FSkin.getRelativeBoldFont(30)); lblStats.setForeground(Color.white); lblStats.setHorizontalAlignment(SwingConstants.CENTER); - lblStats.setFont(FSkin.getFont(26)); + lblStats.setFont(FSkin.getRelativeFont(26)); btnContinue.setText("Next Game"); - btnContinue.setFont(FSkin.getFont(22)); + btnContinue.setFont(FSkin.getRelativeFont(22)); btnRestart.setText("Start New Match"); - btnRestart.setFont(FSkin.getFont(22)); + btnRestart.setFont(FSkin.getRelativeFont(22)); btnQuit.setText("Quit Match"); - btnQuit.setFont(FSkin.getFont(22)); + btnQuit.setFont(FSkin.getRelativeFont(22)); btnContinue.setEnabled(!game0.isMatchOver()); // Assemble game log scroller. final FTextArea txtLog = new FTextArea(); txtLog.setText(StringUtils.join(game.getGameLog().getLogEntries(null), "\r\n").replace("[COMPUTER]", "[AI]")); - txtLog.setFont(FSkin.getFont(14)); + txtLog.setFont(FSkin.getRelativeFont(14)); txtLog.setFocusable(true); // allow highlighting and copying of log final FLabel btnCopyLog = new FLabel.ButtonBuilder().text("Copy to clipboard").build(); @@ -292,7 +292,7 @@ public class ViewWinLose implements IWinLoseView { message = "" + message.replace("\n", "
") + ""; } final SkinnedLabel lblMessage = new SkinnedLabel(message); - lblMessage.setFont(FSkin.getFont(14)); + lblMessage.setFont(FSkin.getRelativeFont(14)); lblMessage.setForeground(FORE_COLOR); lblMessage.setHorizontalAlignment(SwingConstants.CENTER); lblMessage.setIconTextGap(50); @@ -309,7 +309,7 @@ public class ViewWinLose implements IWinLoseView { private class TitleLabel extends SkinnedLabel { TitleLabel(final String msg) { super(msg); - setFont(FSkin.getFont(16)); + setFont(FSkin.getRelativeFont(16)); setPreferredSize(new Dimension(200, 40)); setHorizontalAlignment(SwingConstants.CENTER); setForeground(FORE_COLOR); diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java index 5a3ee81fc41..0e5d565d118 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java @@ -116,11 +116,11 @@ public class VPrompt implements IVDoc { // wrap : 2 columns required for btnOk and btnCancel. container.setLayout(new MigLayout("wrap 2, gap 0px!, insets 1px 1px 3px 1px")); if (prefs.getPrefBoolean(FPref.UI_COMPACT_PROMPT)) { //hide header and use smaller font if compact prompt - tarMessage.setFont(FSkin.getFont(12)); + tarMessage.setFont(FSkin.getFont()); } else { container.add(lblGames, "span 2, w 10:100%, h 22px!"); - tarMessage.setFont(FSkin.getFont(14)); + tarMessage.setFont(FSkin.getRelativeFont(14)); } lblGames.setText("Game Setup"); diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java index 7bf2c3694a0..0f78f73589a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java @@ -191,7 +191,7 @@ public class VStack implements IVDoc { setFocusable(false); setEditable(false); setLineWrap(true); - setFont(FSkin.getFont(12)); + setFont(FSkin.getFont()); setWrapStyleWord(true); setMinimumSize(new Dimension(CARD_WIDTH + 2 * PADDING, CARD_HEIGHT + 2 * PADDING)); diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxPanel.java b/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxPanel.java index a11a6c74066..4e8f403e412 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxPanel.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxPanel.java @@ -82,7 +82,7 @@ public class FComboBoxPanel extends JPanel { if (comboBoxCaption != null && !comboBoxCaption.isEmpty()) { final SkinnedLabel comboLabel = new SkinnedLabel(comboBoxCaption); comboLabel.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); - comboLabel.setFont(FSkin.getBoldFont(12)); + comboLabel.setFont(FSkin.getBoldFont()); add(comboLabel); } } @@ -91,7 +91,7 @@ public class FComboBoxPanel extends JPanel { if (comboBox != null) { comboBox.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); comboBox.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); - comboBox.setFont(FSkin.getFont(12)); + comboBox.setFont(FSkin.getFont()); comboBox.setEditable(false); comboBox.setFocusable(true); comboBox.setOpaque(true); diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java index c9d86367d8a..3cf54afa734 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java @@ -859,8 +859,12 @@ public class FSkin { private static Map avatars; private static Map fixedFonts = new HashMap<>(); + public static Font getFixedFont() { + return getFixedFont(defaultFontSize); + } + /** @return {@link java.awt.font} */ - public static Font getFixedFont(final int size) { + private static Font getFixedFont(final int size) { Font fixedFont = fixedFonts.get(size); if (fixedFont == null) { fixedFont = new Font("Monospaced", Font.PLAIN, size); @@ -869,6 +873,16 @@ public class FSkin { return fixedFont; } + public static Font getRelativeFixedFont(final int relative) { + double multiplier = getMultiplier(relative); + return getFixedFont((int)(defaultFontSize * multiplier)); + } + + private static double getMultiplier(final int relative) { + // don't know of a good way to get the preference default value + return relative / 12.0; + } + /** * @return {@link forge.toolbox.FSkin.SkinFont} */ @@ -884,6 +898,11 @@ public class FSkin { return SkinFont.get(Font.PLAIN, size); } + public static SkinFont getRelativeFont(final int relative) { + double multiplier = getMultiplier(relative); + return SkinFont.get(Font.PLAIN, (int)(defaultFontSize * multiplier)); + } + /** * @return {@link forge.toolbox.FSkin.SkinFont} */ @@ -899,6 +918,11 @@ public class FSkin { return SkinFont.get(Font.BOLD, size); } + public static SkinFont getRelativeBoldFont(final int relative) { + double multiplier = getMultiplier(relative); + return SkinFont.get(Font.BOLD, (int)(defaultFontSize * multiplier)); + } + /** * @return {@link forge.toolbox.FSkin.SkinFont} */ @@ -914,6 +938,11 @@ public class FSkin { return SkinFont.get(Font.ITALIC, size); } + public static SkinFont getRelativeItalicFont(final int relative) { + double multiplier = getMultiplier(relative); + return SkinFont.get(Font.ITALIC, (int)(defaultFontSize * multiplier)); + } + public static void setGraphicsFont(final Graphics g, final SkinFont skinFont) { g.setFont(skinFont.font); } diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FTextEditor.java b/forge-gui-desktop/src/main/java/forge/toolbox/FTextEditor.java index 10b6c489766..202dbaaf1f1 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FTextEditor.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FTextEditor.java @@ -19,7 +19,7 @@ public class FTextEditor extends SkinnedScrollPane { public FTextEditor() { tarEditor = new SkinnedTextArea(); - tarEditor.setFont(FSkin.getFixedFont(16)); + tarEditor.setFont(FSkin.getRelativeFixedFont(16)); tarEditor.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); tarEditor.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); tarEditor.setCaretColor(FSkin.getColor(FSkin.Colors.CLR_TEXT)); diff --git a/forge-gui-desktop/src/main/java/forge/view/FNavigationBar.java b/forge-gui-desktop/src/main/java/forge/view/FNavigationBar.java index 0989fd51008..05eb0e2d3b6 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FNavigationBar.java +++ b/forge-gui-desktop/src/main/java/forge/view/FNavigationBar.java @@ -382,7 +382,7 @@ public class FNavigationBar extends FTitleBarBase { setOpaque(false); this.setIcon(screen0.getTabIcon()); this.setForeground(foreColor.alphaColor(unhoveredAlpha)); - this.setFont(FSkin.getFont(fontSize)); + this.setFont(FSkin.getRelativeFont(fontSize)); int closeButtonOffset; if (screen.allowTabClose()) { @@ -434,7 +434,7 @@ public class FNavigationBar extends FTitleBarBase { private void setSelected(final boolean selected0) { if (this.selected == selected0) { return; } this.selected = selected0; - this.setFont(selected0 ? FSkin.getBoldFont(fontSize) : FSkin.getFont(fontSize)); + this.setFont(selected0 ? FSkin.getRelativeBoldFont(fontSize) : FSkin.getRelativeFont(fontSize)); repaintSelf(); } diff --git a/forge-gui-desktop/src/main/java/forge/view/FTitleBar.java b/forge-gui-desktop/src/main/java/forge/view/FTitleBar.java index 79cb67b87c2..8833bfb8cbd 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FTitleBar.java +++ b/forge-gui-desktop/src/main/java/forge/view/FTitleBar.java @@ -9,7 +9,7 @@ import java.awt.*; @SuppressWarnings("serial") public class FTitleBar extends FTitleBarBase { - private static final FSkin.SkinFont skinFont = FSkin.getFont(12); + private static final FSkin.SkinFont skinFont = FSkin.getFont(); private final SkinnedLabel lblTitle = new SkinnedLabel(); diff --git a/forge-gui-desktop/src/main/java/forge/view/FView.java b/forge-gui-desktop/src/main/java/forge/view/FView.java index 24997a433e3..36b95e8f247 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FView.java +++ b/forge-gui-desktop/src/main/java/forge/view/FView.java @@ -265,7 +265,7 @@ public enum FView { textPane.setOpaque(false); textPane.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT).getColor()); textPane.setBorder(null); - textPane.setFont(FSkin.getFont(14).getBaseFont()); + textPane.setFont(FSkin.getRelativeFont(14).getBaseFont()); final FLabel btnRemindMeLater = new FLabel.Builder().text("Remind Me Later").hoverable().opaque().build(); final FLabel btnDoNotRemindMe = new FLabel.Builder().text("Don't Remind Me Again").hoverable().opaque().build();