From 9ab50c4d9d6a5965112b156d6f3994306f0c2f6b Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Wed, 26 Sep 2018 17:27:15 -0600 Subject: [PATCH 1/2] create and use getRelativeFontSize() method Signed-off-by: Jamin W. Collins --- .../src/main/java/forge/toolbox/FSkin.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 a77bc2086e4..56c535e6720 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java @@ -874,8 +874,7 @@ public class FSkin { } public static Font getRelativeFixedFont(final int relative) { - double multiplier = getMultiplier(relative); - return getFixedFont((int)(defaultFontSize * multiplier)); + return getFixedFont(getRelativeFontSize(relative)); } private static double getMultiplier(final int relative) { @@ -883,6 +882,11 @@ public class FSkin { return relative / 12.0; } + public static Integer getRelativeFontSize(final int relative) { + double multiplier = getMultiplier(relative); + return (int)(defaultFontSize * multiplier); + } + /** * @return {@link forge.toolbox.FSkin.SkinFont} */ @@ -899,8 +903,7 @@ public class FSkin { } public static SkinFont getRelativeFont(final int relative) { - double multiplier = getMultiplier(relative); - return SkinFont.get(Font.PLAIN, (int)(defaultFontSize * multiplier)); + return SkinFont.get(Font.PLAIN, getRelativeFontSize(relative)); } /** @@ -919,8 +922,7 @@ public class FSkin { } public static SkinFont getRelativeBoldFont(final int relative) { - double multiplier = getMultiplier(relative); - return SkinFont.get(Font.BOLD, (int)(defaultFontSize * multiplier)); + return SkinFont.get(Font.BOLD, getRelativeFontSize(relative)); } /** @@ -939,8 +941,7 @@ public class FSkin { } public static SkinFont getRelativeItalicFont(final int relative) { - double multiplier = getMultiplier(relative); - return SkinFont.get(Font.ITALIC, (int)(defaultFontSize * multiplier)); + return SkinFont.get(Font.ITALIC, getRelativeFontSize(relative)); } public static void setGraphicsFont(final Graphics g, final SkinFont skinFont) { From 848df654fadcc610013149e82fe315e14877cf51 Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Wed, 26 Sep 2018 17:28:08 -0600 Subject: [PATCH 2/2] set relative font sizes in Card Detail Panel Signed-off-by: Jamin W. Collins --- .../src/main/java/forge/gui/CardDetailPanel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java index 0575afbdaf1..4909b00b285 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java +++ b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java @@ -85,13 +85,16 @@ public class CardDetailPanel extends SkinnedPanel { setInfoLabel = new JLabel(); setInfoLabel.setHorizontalAlignment(SwingConstants.CENTER); - final Font font = new Font("Dialog", 0, 14); + final Integer fontSizeR12 = FSkin.getRelativeFontSize(12); + final Integer fontSizeR14 = FSkin.getRelativeFontSize(14); + final Font font = new Font("Dialog", 0, fontSizeR14); nameCostLabel.setFont(font); typeLabel.setFont(font); idLabel.setFont(font); powerToughnessLabel.setFont(font); cdArea = new FHtmlViewer(); + cdArea.setFont(new Font("Dialog", 0, fontSizeR12)); cdArea.setBorder(new EmptyBorder(2, 6, 2, 6)); cdArea.setOpaque(false); scrArea = new FScrollPane(cdArea, false);