Merge pull request #14 from rememberber/dev

Dev
This commit is contained in:
周波 2022-03-23 10:40:51 +08:00 committed by GitHub
commit 1c3fc429fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions

View File

@ -25,12 +25,12 @@
<commons-lang3.version>3.12.0</commons-lang3.version>
<guava.version>31.0.1-jre</guava.version>
<okhttp.version>4.9.3</okhttp.version>
<flatlaf.version>2.0.1</flatlaf.version>
<flatlaf-extras.version>2.0.1</flatlaf-extras.version>
<flatlaf-intellij-themes.version>2.0.1</flatlaf-intellij-themes.version>
<flatlaf.version>2.1</flatlaf.version>
<flatlaf-extras.version>2.1</flatlaf-extras.version>
<flatlaf-intellij-themes.version>2.1</flatlaf-intellij-themes.version>
<hutool-all.version>5.7.21</hutool-all.version>
<fastjson.version>1.2.79</fastjson.version>
<oshi-core.version>6.1.3</oshi-core.version>
<oshi-core.version>6.1.5</oshi-core.version>
<jfreechart.version>1.5.3</jfreechart.version>
</properties>

View File

@ -67,7 +67,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<border type="empty"/>
<children>
<component id="29cd0" class="javax.swing.JTextPane" binding="textPane1" default-binding="true">
<constraints/>

View File

@ -9,6 +9,7 @@ import com.luoboduner.moo.info.util.SystemUtil;
import lombok.Getter;
import javax.swing.*;
import javax.swing.border.TitledBorder;
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.StyleSheet;
import java.awt.*;
@ -140,6 +141,7 @@ public class UpdateInfoDialog extends JDialog {
contentPane.add(panel3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
final JScrollPane scrollPane1 = new JScrollPane();
panel3.add(scrollPane1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
scrollPane1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), null, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
textPane1 = new JTextPane();
textPane1.setEditable(false);
textPane1.setMargin(new Insets(80, 28, 3, 28));