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

make font sizes relative to default (12)

Browse Source 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
This commit is contained in:
Jamin W. Collins
2018-09-24 17:29:42 -06:00
parent e6af6abfcf
commit 7781660c11
30 changed files with 80 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java
View File

@@ -20,7 +20,7 @@ public class DecksComboBox extends FComboBoxWrapper<DeckType> {
private DeckType selectedDeckType = null; private DeckType selectedDeckType = null;
public DecksComboBox() { public DecksComboBox() {
setSkinFont(FSkin.getBoldFont(14)); setSkinFont(FSkin.getRelativeBoldFont(14));
setTextAlignment(TextAlignment.CENTER); setTextAlignment(TextAlignment.CENTER);
addActionListener(getDeckTypeComboListener()); addActionListener(getDeckTypeComboListener());
} }

2
forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java
View File

@@ -90,7 +90,7 @@ public class GuiDownloader extends DefaultBoundedRangeModel {
radProxyNone.setSelected(true); radProxyNone.setSelected(true);
btnClose.setBorder(new FSkin.LineSkinBorder(FSkin.getColor(FSkin.Colors.CLR_TEXT))); btnClose.setBorder(new FSkin.LineSkinBorder(FSkin.getColor(FSkin.Colors.CLR_TEXT)));
btnStart.setFont(FSkin.getFont(18)); btnStart.setFont(FSkin.getRelativeFont(18));
btnStart.setEnabled(false); btnStart.setEnabled(false);
progressBar.reset(); progressBar.reset();

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/ItemFilter.java
View File

@@ -27,7 +27,7 @@ public abstract class ItemFilter<T extends InventoryItem> {
public static void layoutCheckbox(SkinnedCheckBox cb) { public static void layoutCheckbox(SkinnedCheckBox cb) {
cb.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); cb.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
cb.setFont(FSkin.getFont(12)); cb.setFont(FSkin.getFont());
cb.setOpaque(false); cb.setOpaque(false);
cb.setFocusable(false); cb.setFocusable(false);
} }

2
forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
View File

@@ -63,7 +63,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private static final float PILE_SPACING_Y = 0.1f; 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_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 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_HEIGHT = 19;
private static final int GROUP_HEADER_GLYPH_WIDTH = 6; private static final int GROUP_HEADER_GLYPH_WIDTH = 6;
private static final int MIN_COLUMN_COUNT = 1; private static final int MIN_COLUMN_COUNT = 1;

2
forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java
View File

@@ -103,7 +103,7 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
static final SkinColor ALT_ROW_COLOR = BACK_COLOR.getContrastColor(-20); static final SkinColor ALT_ROW_COLOR = BACK_COLOR.getContrastColor(-20);
private static final SkinColor GRID_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 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 static final int ROW_HEIGHT = 19;
private final ItemTable table = new ItemTable(); private final ItemTable table = new ItemTable();

2
forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java
View File

@@ -103,7 +103,7 @@ public class AddBasicLandsDialog {
panel.add(pnlForest); panel.add(pnlForest);
panel.add(lblDeckInfo); panel.add(lblDeckInfo);
lblDeckInfo.setFont(FSkin.getFont(14)); lblDeckInfo.setFont(FSkin.getRelativeFont(14));
lblDeckInfo.addMouseListener(new FMouseAdapter() { lblDeckInfo.addMouseListener(new FMouseAdapter() {
@Override @Override
public void onLeftDoubleClick(MouseEvent e) { public void onLeftDoubleClick(MouseEvent e) {

2
forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java
View File

@@ -38,7 +38,7 @@ public class LblGroup extends SkinnedLabel implements ILocalRepaint {
public LblGroup(final EMenuGroup e0) { public LblGroup(final EMenuGroup e0) {
super(" " + e0.getTitle()); super(" " + e0.getTitle());
this.setFont(FSkin.getBoldFont(14)); this.setFont(FSkin.getRelativeBoldFont(14));
this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
this.addMouseListener(new MouseAdapter() { this.addMouseListener(new MouseAdapter() {

2
forge-gui-desktop/src/main/java/forge/screens/home/LblHeader.java
View File

@@ -25,7 +25,7 @@ public class LblHeader extends SkinnedLabel {
public LblHeader(final String txt0) { public LblHeader(final String txt0) {
super(txt0); super(txt0);
this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); 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)); this.setBorder(new EmptyBorder(5, 30, 0, 0));
} }

2
forge-gui-desktop/src/main/java/forge/screens/home/LblMenuItem.java
View File

@@ -36,7 +36,7 @@ public class LblMenuItem extends SkinnedLabel implements ILocalRepaint {
public LblMenuItem(final IVSubmenu<? extends ICDoc> doc0) { public LblMenuItem(final IVSubmenu<? extends ICDoc> doc0) {
super(" " + doc0.getMenuTitle()); super(" " + doc0.getMenuTitle());
this.setFont(FSkin.getFont(14)); this.setFont(FSkin.getRelativeFont(14));
this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
this.addMouseListener(new MouseAdapter() { this.addMouseListener(new MouseAdapter() {

2
forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java
View File

@@ -663,7 +663,7 @@ public class PlayerPanel extends FPanel {
txtPlayerName.setText(name); txtPlayerName.setText(name);
txtPlayerName.setFocusable(true); txtPlayerName.setFocusable(true);
txtPlayerName.setFont(FSkin.getFont(14)); txtPlayerName.setFont(FSkin.getRelativeFont(14));
txtPlayerName.addActionListener(lobby.nameListener); txtPlayerName.addActionListener(lobby.nameListener);
txtPlayerName.addFocusListener(nameFocusListener); txtPlayerName.addFocusListener(nameFocusListener);
} }

2
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java
View File

@@ -107,7 +107,7 @@ public enum VSubmenuGauntletQuick implements IVSubmenu<CSubmenuGauntletQuick> {
sliOpponents.setSnapToTicks(true); sliOpponents.setSnapToTicks(true);
sliOpponents.setOpaque(false); sliOpponents.setOpaque(false);
sliOpponents.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); 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.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2));
pnlOptions.add(lblOptions, "h 30px!, w 96%!, gap 2% 0 0 5px"); pnlOptions.add(lblOptions, "h 30px!, w 96%!, gap 2% 0 0 5px");

2
forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java
View File

@@ -64,7 +64,7 @@ public enum VSubmenuOnlineLobby implements IVSubmenu<CSubmenuOnlineLobby>, IOnli
if (lobby == null) { if (lobby == null) {
final FButton btnConnect = new FButton("Connect to Server"); final FButton btnConnect = new FButton("Connect to Server");
btnConnect.setFont(FSkin.getFont(20)); btnConnect.setFont(FSkin.getRelativeFont(20));
btnConnect.addActionListener(new ActionListener() { btnConnect.addActionListener(new ActionListener() {
@Override @Override
public final void actionPerformed(final ActionEvent e) { public final void actionPerformed(final ActionEvent e) {

6
forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlDraftEvent.java
View File

@@ -27,17 +27,17 @@ public class PnlDraftEvent extends JPanel {
super(); super();
radButton = new FRadioButton(event.getTitle()); radButton = new FRadioButton(event.getTitle());
radButton.setFont(FSkin.getBoldFont(20)); radButton.setFont(FSkin.getRelativeBoldFont(20));
radButton.setIconTextGap(10); radButton.setIconTextGap(10);
final FTextArea eventBoosters = new FTextArea(); final FTextArea eventBoosters = new FTextArea();
final FTextArea eventFee = new FTextArea(); final FTextArea eventFee = new FTextArea();
eventBoosters.setText(event.getBoosterList()); eventBoosters.setText(event.getBoosterList());
eventBoosters.setFont(FSkin.getFont(12)); eventBoosters.setFont(FSkin.getFont());
eventFee.setText(QuestUtil.formatCredits(event.getEntryFee()) + " Credit Entry Fee"); eventFee.setText(QuestUtil.formatCredits(event.getEntryFee()) + " Credit Entry Fee");
eventFee.setFont(FSkin.getFont(12)); eventFee.setFont(FSkin.getFont());
radButton.addChangeListener(new ChangeListener() { radButton.addChangeListener(new ChangeListener() {
@Override @Override

4
forge-gui-desktop/src/main/java/forge/screens/home/quest/PnlEvent.java
View File

@@ -56,11 +56,11 @@ class PnlEvent extends JPanel {
// Title and description // Title and description
this.rad = new FRadioButton(event.getFullTitle()); this.rad = new FRadioButton(event.getFullTitle());
this.rad.setFont(FSkin.getBoldFont(16)); this.rad.setFont(FSkin.getRelativeBoldFont(16));
final FTextArea tarDesc = new FTextArea(); final FTextArea tarDesc = new FTextArea();
tarDesc.setText(event.getDescription()); tarDesc.setText(event.getDescription());
tarDesc.setFont(FSkin.getItalicFont(12)); tarDesc.setFont(FSkin.getItalicFont());
tarDesc.addMouseListener(new MouseAdapter() { tarDesc.addMouseListener(new MouseAdapter() {
@Override @Override

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java
View File

@@ -509,7 +509,7 @@ public enum VSubmenuQuestPrefs implements IVSubmenu<CSubmenuQuestPrefs> {
this.setOpaque(false); this.setOpaque(false);
this.setBorder((Border)null); this.setBorder((Border)null);
this.setFont(FSkin.getFont(13)); this.setFont(FSkin.getRelativeFont(13));
this.setForeground(clrText); this.setForeground(clrText);
this.setCaretColor(clrText); this.setCaretColor(clrText);
this.setBackground(clrHover); this.setBackground(clrHover);

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewStall.java
View File

@@ -80,7 +80,7 @@ public class ViewStall extends JPanel {
this.tpnFluff.setOpaque(false); this.tpnFluff.setOpaque(false);
this.tpnFluff.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); 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.setFocusable(false);
this.tpnFluff.setEditable(false); this.tpnFluff.setEditable(false);
this.tpnFluff.setBorder((Border)null); this.tpnFluff.setBorder((Border)null);

2
forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java
View File

@@ -193,7 +193,7 @@ public enum VSubmenuSealed implements IVSubmenu<CSubmenuSealed> {
final SkinnedTextPane tpnDirections = new SkinnedTextPane(); final SkinnedTextPane tpnDirections = new SkinnedTextPane();
tpnDirections.setOpaque(false); tpnDirections.setOpaque(false);
tpnDirections.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); tpnDirections.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
tpnDirections.setFont(FSkin.getFont(15)); tpnDirections.setFont(FSkin.getRelativeFont(15));
tpnDirections.setAlignmentX(SwingConstants.CENTER); tpnDirections.setAlignmentX(SwingConstants.CENTER);
tpnDirections.setFocusable(false); tpnDirections.setFocusable(false);
tpnDirections.setEditable(false); tpnDirections.setEditable(false);

10
forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java
View File

@@ -48,8 +48,8 @@ public enum VSubmenuAchievements implements IVSubmenu<CSubmenuAchievements> {
private static final int TROPHIES_PER_SHELVE = 4; private static final int TROPHIES_PER_SHELVE = 4;
private static final int PADDING = 5; private static final int PADDING = 5;
private static final int TROPHY_PADDING = 45; private static final int TROPHY_PADDING = 45;
private static final SkinFont NAME_FONT = FSkin.getBoldFont(14); private static final SkinFont NAME_FONT = FSkin.getRelativeBoldFont(14);
private static final SkinFont DESC_FONT = FSkin.getFont(12); private static final SkinFont DESC_FONT = FSkin.getFont();
private static final SkinColor TEXT_COLOR = FSkin.getColor(Colors.CLR_TEXT); 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 NOT_EARNED_COLOR = TEXT_COLOR.alphaColor(128);
private static final SkinColor TEXTURE_OVERLAY_COLOR = FSkin.getColor(Colors.CLR_THEME); private static final SkinColor TEXTURE_OVERLAY_COLOR = FSkin.getColor(Colors.CLR_THEME);
@@ -121,7 +121,7 @@ public enum VSubmenuAchievements implements IVSubmenu<CSubmenuAchievements> {
AchievementCollection.buildComboBox(cbCollections); AchievementCollection.buildComboBox(cbCollections);
cbCollections.setSkinFont(FSkin.getBoldFont(14)); cbCollections.setSkinFont(FSkin.getRelativeBoldFont(14));
cbCollections.setTextAlignment(TextAlignment.CENTER); cbCollections.setTextAlignment(TextAlignment.CENTER);
cbCollections.addActionListener(new ActionListener() { cbCollections.addActionListener(new ActionListener() {
@Override @Override
@@ -264,8 +264,8 @@ public enum VSubmenuAchievements implements IVSubmenu<CSubmenuAchievements> {
private static final SkinImage imgTop = FSkin.getImage(FSkinProp.IMG_TROPHY_CASE_TOP); 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 imgShelf = FSkin.getImage(FSkinProp.IMG_TROPHY_SHELF);
private static final SkinImage imgTrophyPlate = FSkin.getImage(FSkinProp.IMG_TROPHY_PLATE); 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 font = FSkin.getRelativeFixedFont(14).deriveFont(Font.BOLD);
private static final Font subFont = FSkin.getFixedFont(12); private static final Font subFont = FSkin.getFixedFont();
private static final Color foreColor = new Color(239, 220, 144); private static final Color foreColor = new Color(239, 220, 144);
private AchievementCollection achievements; private AchievementCollection achievements;

8
forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java
View File

@@ -391,7 +391,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
private final class OptionsCheckBox extends FCheckBox { private final class OptionsCheckBox extends FCheckBox {
private OptionsCheckBox(final String txt0) { private OptionsCheckBox(final String txt0) {
super(txt0); super(txt0);
this.setFont(FSkin.getBoldFont(12)); this.setFont(FSkin.getBoldFont());
} }
} }
@@ -402,7 +402,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
super(txt0); super(txt0);
this.setBorder(new FSkin.MatteSkinBorder(0, 0, 1, 0, FSkin.getColor(FSkin.Colors.CLR_BORDERS))); this.setBorder(new FSkin.MatteSkinBorder(0, 0, 1, 0, FSkin.getColor(FSkin.Colors.CLR_BORDERS)));
setHorizontalAlignment(SwingConstants.CENTER); setHorizontalAlignment(SwingConstants.CENTER);
this.setFont(FSkin.getBoldFont(16)); this.setFont(FSkin.getRelativeBoldFont(16));
this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
} }
} }
@@ -412,7 +412,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
private final class NoteLabel extends SkinnedLabel { private final class NoteLabel extends SkinnedLabel {
private NoteLabel(final String txt0) { private NoteLabel(final String txt0) {
super(txt0); super(txt0);
this.setFont(FSkin.getItalicFont(12)); this.setFont(FSkin.getItalicFont());
this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
} }
} }
@@ -436,7 +436,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
public KeyboardShortcutField(final Shortcut shortcut0) { public KeyboardShortcutField(final Shortcut shortcut0) {
super(); super();
this.setEditable(false); this.setEditable(false);
this.setFont(FSkin.getFont(14)); this.setFont(FSkin.getRelativeFont(14));
final FPref prefKey = shortcut0.getPrefKey(); final FPref prefKey = shortcut0.getPrefKey();
reload(prefKey); reload(prefKey);

2
forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuReleaseNotes.java
View File

@@ -60,7 +60,7 @@ public enum VSubmenuReleaseNotes implements IVSubmenu<CSubmenuReleaseNotes> {
tar.setEditable(false); tar.setEditable(false);
tar.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); 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.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
tar.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); tar.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2));

4
forge-gui-desktop/src/main/java/forge/screens/match/LimitedWinLose.java
View File

@@ -59,7 +59,7 @@ public class LimitedWinLose extends ControlWinLose {
TitleLabel lblTemp1 = new TitleLabel(title); TitleLabel lblTemp1 = new TitleLabel(title);
SkinnedLabel lblTemp2 = new SkinnedLabel(message); SkinnedLabel lblTemp2 = new SkinnedLabel(message);
lblTemp2.setHorizontalAlignment(SwingConstants.CENTER); lblTemp2.setHorizontalAlignment(SwingConstants.CENTER);
lblTemp2.setFont(FSkin.getFont(17)); lblTemp2.setFont(FSkin.getRelativeFont(17));
lblTemp2.setForeground(FORE_COLOR); lblTemp2.setForeground(FORE_COLOR);
lblTemp2.setIconTextGap(50); lblTemp2.setIconTextGap(50);
getView().getPnlCustom().add(lblTemp1, LimitedWinLose.CONSTRAINTS_TITLE); getView().getPnlCustom().add(lblTemp1, LimitedWinLose.CONSTRAINTS_TITLE);
@@ -136,7 +136,7 @@ public class LimitedWinLose extends ControlWinLose {
private class TitleLabel extends SkinnedLabel { private class TitleLabel extends SkinnedLabel {
TitleLabel(final String msg) { TitleLabel(final String msg) {
super(msg); super(msg);
setFont(FSkin.getFont(18)); setFont(FSkin.getRelativeFont(18));
setPreferredSize(new Dimension(200, 40)); setPreferredSize(new Dimension(200, 40));
setHorizontalAlignment(SwingConstants.CENTER); setHorizontalAlignment(SwingConstants.CENTER);
setForeground(FORE_COLOR); setForeground(FORE_COLOR);

16
forge-gui-desktop/src/main/java/forge/screens/match/ViewWinLose.java
View File

@@ -110,24 +110,24 @@ public class ViewWinLose implements IWinLoseView<FButton> {
lblTitle.setForeground(Color.white); lblTitle.setForeground(Color.white);
lblTitle.setHorizontalAlignment(SwingConstants.CENTER); lblTitle.setHorizontalAlignment(SwingConstants.CENTER);
lblTitle.setFont(FSkin.getBoldFont(30)); lblTitle.setFont(FSkin.getRelativeBoldFont(30));
lblStats.setForeground(Color.white); lblStats.setForeground(Color.white);
lblStats.setHorizontalAlignment(SwingConstants.CENTER); lblStats.setHorizontalAlignment(SwingConstants.CENTER);
lblStats.setFont(FSkin.getFont(26)); lblStats.setFont(FSkin.getRelativeFont(26));
btnContinue.setText("Next Game"); btnContinue.setText("Next Game");
btnContinue.setFont(FSkin.getFont(22)); btnContinue.setFont(FSkin.getRelativeFont(22));
btnRestart.setText("Start New Match"); btnRestart.setText("Start New Match");
btnRestart.setFont(FSkin.getFont(22)); btnRestart.setFont(FSkin.getRelativeFont(22));
btnQuit.setText("Quit Match"); btnQuit.setText("Quit Match");
btnQuit.setFont(FSkin.getFont(22)); btnQuit.setFont(FSkin.getRelativeFont(22));
btnContinue.setEnabled(!game0.isMatchOver()); btnContinue.setEnabled(!game0.isMatchOver());
// Assemble game log scroller. // Assemble game log scroller.
final FTextArea txtLog = new FTextArea(); final FTextArea txtLog = new FTextArea();
txtLog.setText(StringUtils.join(game.getGameLog().getLogEntries(null), "\r\n").replace("[COMPUTER]", "[AI]")); 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 txtLog.setFocusable(true); // allow highlighting and copying of log
final FLabel btnCopyLog = new FLabel.ButtonBuilder().text("Copy to clipboard").build(); final FLabel btnCopyLog = new FLabel.ButtonBuilder().text("Copy to clipboard").build();
@@ -292,7 +292,7 @@ public class ViewWinLose implements IWinLoseView<FButton> {
message = "<html>" + message.replace("\n", "<br>") + "</html>"; message = "<html>" + message.replace("\n", "<br>") + "</html>";
} }
final SkinnedLabel lblMessage = new SkinnedLabel(message); final SkinnedLabel lblMessage = new SkinnedLabel(message);
lblMessage.setFont(FSkin.getFont(14)); lblMessage.setFont(FSkin.getRelativeFont(14));
lblMessage.setForeground(FORE_COLOR); lblMessage.setForeground(FORE_COLOR);
lblMessage.setHorizontalAlignment(SwingConstants.CENTER); lblMessage.setHorizontalAlignment(SwingConstants.CENTER);
lblMessage.setIconTextGap(50); lblMessage.setIconTextGap(50);
@@ -309,7 +309,7 @@ public class ViewWinLose implements IWinLoseView<FButton> {
private class TitleLabel extends SkinnedLabel { private class TitleLabel extends SkinnedLabel {
TitleLabel(final String msg) { TitleLabel(final String msg) {
super(msg); super(msg);
setFont(FSkin.getFont(16)); setFont(FSkin.getRelativeFont(16));
setPreferredSize(new Dimension(200, 40)); setPreferredSize(new Dimension(200, 40));
setHorizontalAlignment(SwingConstants.CENTER); setHorizontalAlignment(SwingConstants.CENTER);
setForeground(FORE_COLOR); setForeground(FORE_COLOR);

4
forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java
View File

@@ -116,11 +116,11 @@ public class VPrompt implements IVDoc<CPrompt> {
// wrap : 2 columns required for btnOk and btnCancel. // wrap : 2 columns required for btnOk and btnCancel.
container.setLayout(new MigLayout("wrap 2, gap 0px!, insets 1px 1px 3px 1px")); 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 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 { else {
container.add(lblGames, "span 2, w 10:100%, h 22px!"); container.add(lblGames, "span 2, w 10:100%, h 22px!");
tarMessage.setFont(FSkin.getFont(14)); tarMessage.setFont(FSkin.getRelativeFont(14));
} }
lblGames.setText("Game Setup"); lblGames.setText("Game Setup");

2
forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java
View File

@@ -191,7 +191,7 @@ public class VStack implements IVDoc<CStack> {
setFocusable(false); setFocusable(false);
setEditable(false); setEditable(false);
setLineWrap(true); setLineWrap(true);
setFont(FSkin.getFont(12)); setFont(FSkin.getFont());
setWrapStyleWord(true); setWrapStyleWord(true);
setMinimumSize(new Dimension(CARD_WIDTH + 2 * PADDING, CARD_HEIGHT + 2 * PADDING)); setMinimumSize(new Dimension(CARD_WIDTH + 2 * PADDING, CARD_HEIGHT + 2 * PADDING));

4
forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxPanel.java
View File

@@ -82,7 +82,7 @@ public class FComboBoxPanel<E> extends JPanel {
if (comboBoxCaption != null && !comboBoxCaption.isEmpty()) { if (comboBoxCaption != null && !comboBoxCaption.isEmpty()) {
final SkinnedLabel comboLabel = new SkinnedLabel(comboBoxCaption); final SkinnedLabel comboLabel = new SkinnedLabel(comboBoxCaption);
comboLabel.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); comboLabel.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
comboLabel.setFont(FSkin.getBoldFont(12)); comboLabel.setFont(FSkin.getBoldFont());
add(comboLabel); add(comboLabel);
} }
} }
@@ -91,7 +91,7 @@ public class FComboBoxPanel<E> extends JPanel {
if (comboBox != null) { if (comboBox != null) {
comboBox.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); comboBox.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2));
comboBox.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); comboBox.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
comboBox.setFont(FSkin.getFont(12)); comboBox.setFont(FSkin.getFont());
comboBox.setEditable(false); comboBox.setEditable(false);
comboBox.setFocusable(true); comboBox.setFocusable(true);
comboBox.setOpaque(true); comboBox.setOpaque(true);

31
forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
View File

@@ -859,8 +859,12 @@ public class FSkin {
private static Map<Integer, SkinImage> avatars; private static Map<Integer, SkinImage> avatars;
private static Map<Integer, Font> fixedFonts = new HashMap<>(); private static Map<Integer, Font> fixedFonts = new HashMap<>();
public static Font getFixedFont() {
return getFixedFont(defaultFontSize);
}
/** @return {@link java.awt.font} */ /** @return {@link java.awt.font} */
public static Font getFixedFont(final int size) { private static Font getFixedFont(final int size) {
Font fixedFont = fixedFonts.get(size); Font fixedFont = fixedFonts.get(size);
if (fixedFont == null) { if (fixedFont == null) {
fixedFont = new Font("Monospaced", Font.PLAIN, size); fixedFont = new Font("Monospaced", Font.PLAIN, size);
@@ -869,6 +873,16 @@ public class FSkin {
return fixedFont; 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} * @return {@link forge.toolbox.FSkin.SkinFont}
*/ */
@@ -884,6 +898,11 @@ public class FSkin {
return SkinFont.get(Font.PLAIN, size); 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} * @return {@link forge.toolbox.FSkin.SkinFont}
*/ */
@@ -899,6 +918,11 @@ public class FSkin {
return SkinFont.get(Font.BOLD, size); 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} * @return {@link forge.toolbox.FSkin.SkinFont}
*/ */
@@ -914,6 +938,11 @@ public class FSkin {
return SkinFont.get(Font.ITALIC, size); 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) { public static void setGraphicsFont(final Graphics g, final SkinFont skinFont) {
g.setFont(skinFont.font); g.setFont(skinFont.font);
} }

2
forge-gui-desktop/src/main/java/forge/toolbox/FTextEditor.java
View File

@@ -19,7 +19,7 @@ public class FTextEditor extends SkinnedScrollPane {
public FTextEditor() { public FTextEditor() {
tarEditor = new SkinnedTextArea(); tarEditor = new SkinnedTextArea();
tarEditor.setFont(FSkin.getFixedFont(16)); tarEditor.setFont(FSkin.getRelativeFixedFont(16));
tarEditor.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); tarEditor.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
tarEditor.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); tarEditor.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2));
tarEditor.setCaretColor(FSkin.getColor(FSkin.Colors.CLR_TEXT)); tarEditor.setCaretColor(FSkin.getColor(FSkin.Colors.CLR_TEXT));

4
forge-gui-desktop/src/main/java/forge/view/FNavigationBar.java
View File

@@ -382,7 +382,7 @@ public class FNavigationBar extends FTitleBarBase {
setOpaque(false); setOpaque(false);
this.setIcon(screen0.getTabIcon()); this.setIcon(screen0.getTabIcon());
this.setForeground(foreColor.alphaColor(unhoveredAlpha)); this.setForeground(foreColor.alphaColor(unhoveredAlpha));
this.setFont(FSkin.getFont(fontSize)); this.setFont(FSkin.getRelativeFont(fontSize));
int closeButtonOffset; int closeButtonOffset;
if (screen.allowTabClose()) { if (screen.allowTabClose()) {
@@ -434,7 +434,7 @@ public class FNavigationBar extends FTitleBarBase {
private void setSelected(final boolean selected0) { private void setSelected(final boolean selected0) {
if (this.selected == selected0) { return; } if (this.selected == selected0) { return; }
this.selected = selected0; this.selected = selected0;
this.setFont(selected0 ? FSkin.getBoldFont(fontSize) : FSkin.getFont(fontSize)); this.setFont(selected0 ? FSkin.getRelativeBoldFont(fontSize) : FSkin.getRelativeFont(fontSize));
repaintSelf(); repaintSelf();
} }

2
forge-gui-desktop/src/main/java/forge/view/FTitleBar.java
View File

@@ -9,7 +9,7 @@ import java.awt.*;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class FTitleBar extends FTitleBarBase { 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(); private final SkinnedLabel lblTitle = new SkinnedLabel();

2
forge-gui-desktop/src/main/java/forge/view/FView.java
View File

@@ -265,7 +265,7 @@ public enum FView {
textPane.setOpaque(false); textPane.setOpaque(false);
textPane.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT).getColor()); textPane.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT).getColor());
textPane.setBorder(null); 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 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(); final FLabel btnDoNotRemindMe = new FLabel.Builder().text("Don't Remind Me Again").hoverable().opaque().build();