hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DescriptionArea not applying font size change

Browse Source
This commit is contained in:
SiboVG 2023-07-15 02:53:17 +02:00
parent aa104f6d0c
commit d9f9f139ab
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
swing/src/net/sf/openrocket/gui/components/DescriptionArea.java
View File

@ -34,6 +34,7 @@ public class DescriptionArea extends JScrollPane {
private final JEditorPane editorPane; private final JEditorPane editorPane;
private static final SwingPreferences prefs = (SwingPreferences) Application.getPreferences(); private static final SwingPreferences prefs = (SwingPreferences) Application.getPreferences();
private final float size;
/** /**
@ -89,10 +90,9 @@ public class DescriptionArea extends JScrollPane {
public DescriptionArea(String text, int rows, float size, boolean opaque) { public DescriptionArea(String text, int rows, float size, boolean opaque) {
super(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, super(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
this.size = size;
editorPane = new JEditorPane("text/html", ""); editorPane = new JEditorPane("text/html", "");
Font font = editorPane.getFont();
editorPane.setFont(font.deriveFont(font.getSize2D() + size));
editorPane.setEditable(false); editorPane.setEditable(false);
editorPane.addHyperlinkListener(new HyperlinkListener() { editorPane.addHyperlinkListener(new HyperlinkListener() {
public void hyperlinkUpdate(HyperlinkEvent e) { public void hyperlinkUpdate(HyperlinkEvent e) {
@ -166,11 +166,11 @@ public class DescriptionArea extends JScrollPane {
} }
// Calculate correct height // Calculate correct height
editorPane.setText("abc"); this.setText("abc");
Dimension oneline = editorPane.getPreferredSize(); Dimension oneline = editorPane.getPreferredSize();
editorPane.setText("abc<br>def"); this.setText("abc<br>def");
Dimension twolines = editorPane.getPreferredSize(); Dimension twolines = editorPane.getPreferredSize();
editorPane.setText(""); this.setText("");
int lineheight = twolines.height - oneline.height; int lineheight = twolines.height - oneline.height;
int extraheight = oneline.height - lineheight; int extraheight = oneline.height - lineheight;
@ -186,7 +186,12 @@ public class DescriptionArea extends JScrollPane {
} }
public void setText(String txt) { public void setText(String txt) {
editorPane.setText(txt); // Set the font size (we can't simply set the font to change the font size, because we're using text/html)
Font defaultFont = editorPane.getFont();
String fontName = defaultFont.getFontName();
float fontSize = defaultFont.getSize2D() + size;
editorPane.setText("<html><body style='font-family:" + fontName + ";font-size:" + fontSize + "pt;'>" + txt + "</body></html>");
editorPane.revalidate(); editorPane.revalidate();
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {