mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 11:18:01 +00:00
create and use getRelativeFontSize() method
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user