From 5b2a7f5595df15bf73686718aeba7d0e90cb35cc Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Fri, 11 Feb 2022 01:15:31 +0100 Subject: [PATCH] Update fonts license & bug dialog --- swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java | 2 ++ swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java index e2e723163..946ecd224 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java @@ -19,6 +19,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextPane; +import javax.swing.UIManager; import com.jogamp.opengl.JoglVersion; @@ -72,6 +73,7 @@ public class BugReportDialog extends JDialog { final JEditorPane editorPane = new JEditorPane("text/html", formatNewlineHTML(message)); editorPane.putClientProperty(JTextPane.HONOR_DISPLAY_PROPERTIES, true); + editorPane.setFont(UIManager.getFont("Label.font")); editorPane.setPreferredSize(new Dimension(600, 400)); editorPane.setEditable(true); editorPane.setCaretPosition(0); // Scroll to the top by default diff --git a/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java index 0a140ac7b..31fc47290 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java @@ -8,6 +8,7 @@ import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.UIManager; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.components.DescriptionArea; @@ -138,7 +139,7 @@ public class LicenseDialog extends JDialog { /*****************************************************************************************************************************/ DescriptionArea info = new DescriptionArea(20); - info.setTextFont(null); + info.setTextFont(UIManager.getFont("Label.font")); info.setText(orLicense + componentsLicense + fontLicense + commonmarkLicense); panel.add(info, "newline, width 700lp, height 250lp, pushy, grow, spanx, wrap para");