external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'themes' into 'master'

Browse Source 
theme related fixes

See merge request core-developers/forge!953
This commit is contained in:
Michael Kamensky
2018-09-27 04:35:18 +00:00
parent c8ab4ff0c4 848df654fa
commit fc8142db8b
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
View File

@@ -85,13 +85,16 @@ public class CardDetailPanel extends SkinnedPanel {
setInfoLabel = new JLabel(); setInfoLabel = new JLabel();
setInfoLabel.setHorizontalAlignment(SwingConstants.CENTER); 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); nameCostLabel.setFont(font);
typeLabel.setFont(font); typeLabel.setFont(font);
idLabel.setFont(font); idLabel.setFont(font);
powerToughnessLabel.setFont(font); powerToughnessLabel.setFont(font);
cdArea = new FHtmlViewer(); cdArea = new FHtmlViewer();
cdArea.setFont(new Font("Dialog", 0, fontSizeR12));
cdArea.setBorder(new EmptyBorder(2, 6, 2, 6)); cdArea.setBorder(new EmptyBorder(2, 6, 2, 6));
cdArea.setOpaque(false); cdArea.setOpaque(false);
scrArea = new FScrollPane(cdArea, false); scrArea = new FScrollPane(cdArea, false);

17
forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
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) {