dialog

Enaium · Enaium · commit 6cc4d2f7dfe6 · 2022-10-14T15:43:45.000+08:00
diff --git a/src/main/java/cn/enaium/joe/dialog/ContactDialog.java b/src/main/java/cn/enaium/joe/dialog/ContactDialog.java
@@ -51,6 +51,7 @@ public void addLink(JPanel panel, String name, Icon icon, String link) {
         panel.add(new JLabel(icon));
         panel.add(new JLabel(name));
         panel.add(new JLabel("<html><a style=\"text-decoration: underline\">" + link + "</a></html>") {{
+            setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
             addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
diff --git a/src/main/java/cn/enaium/joe/dialog/OptionDialog.java b/src/main/java/cn/enaium/joe/dialog/OptionDialog.java
@@ -18,6 +18,7 @@
 
 import cn.enaium.joe.gui.panel.BorderPanel;
 import cn.enaium.joe.gui.panel.confirm.ConfirmPanel;
+import cn.enaium.joe.util.Util;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -61,15 +62,22 @@ public OptionDialog(String title, Object message, int type, Runnable confirm, Ru
                 } else {
                     content = ((Component) message);
                 }
-                setTop(new BorderPanel() {{
-                    setLeft(new JLabel(getIconForType(type)));
-                    setCenter(content);
-                }});
+                setLeft(new JLabel(getIconForType(type)));
+                setCenter(content);
             }
             setBottom(bottom);
         }});
         setModal(true);
-        pack();
+        Dimension size = Util.screenSize(getPreferredSize());
+        if (size.width > getWidth()) {
+            size.width = getWidth();
+        }
+
+        if (size.height > getHeight()) {
+            size.height = getHeight();
+        }
+        setMinimumSize(size);
+        setSize(size);
     }
 
     public OptionDialog(String title, Object message, int type) {
