create and use getRelativeFontSize() method

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
This commit is contained in:
Jamin W. Collins
2018-09-26 17:27:15 -06:00
parent c8ab4ff0c4
commit 9ab50c4d9d

View File

@@ -874,8 +874,7 @@ public class FSkin {
} }
public static Font getRelativeFixedFont(final int relative) { public static Font getRelativeFixedFont(final int relative) {
double multiplier = getMultiplier(relative); return getFixedFont(getRelativeFontSize(relative));
return getFixedFont((int)(defaultFontSize * multiplier));
} }
private static double getMultiplier(final int relative) { private static double getMultiplier(final int relative) {
@@ -883,6 +882,11 @@ public class FSkin {
return relative / 12.0; 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} * @return {@link forge.toolbox.FSkin.SkinFont}
*/ */
@@ -899,8 +903,7 @@ public class FSkin {
} }
public static SkinFont getRelativeFont(final int relative) { public static SkinFont getRelativeFont(final int relative) {
double multiplier = getMultiplier(relative); return SkinFont.get(Font.PLAIN, getRelativeFontSize(relative));
return SkinFont.get(Font.PLAIN, (int)(defaultFontSize * multiplier));
} }
/** /**
@@ -919,8 +922,7 @@ public class FSkin {
} }
public static SkinFont getRelativeBoldFont(final int relative) { public static SkinFont getRelativeBoldFont(final int relative) {
double multiplier = getMultiplier(relative); return SkinFont.get(Font.BOLD, getRelativeFontSize(relative));
return SkinFont.get(Font.BOLD, (int)(defaultFontSize * multiplier));
} }
/** /**
@@ -939,8 +941,7 @@ public class FSkin {
} }
public static SkinFont getRelativeItalicFont(final int relative) { public static SkinFont getRelativeItalicFont(final int relative) {
double multiplier = getMultiplier(relative); return SkinFont.get(Font.ITALIC, getRelativeFontSize(relative));
return SkinFont.get(Font.ITALIC, (int)(defaultFontSize * multiplier));
} }
public static void setGraphicsFont(final Graphics g, final SkinFont skinFont) { public static void setGraphicsFont(final Graphics g, final SkinFont skinFont) {