From 45a0084ec9ae02c49bf4945a33cc95aa91b5f369 Mon Sep 17 00:00:00 2001
From: liwenjun <2684903586@qq.com>
Date: Thu, 17 Oct 2024 16:42:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=94=E6=AC=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Calculator/src/Calculator.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Calculator/src/Calculator.java b/Calculator/src/Calculator.java
index e2f067f..8e492e6 100644
--- a/Calculator/src/Calculator.java
+++ b/Calculator/src/Calculator.java
@@ -18,7 +18,7 @@ public class Calculator extends JFrame implements ActionListener {
         add(textField, BorderLayout.NORTH);
 
         JPanel panel = new JPanel();
-        panel.setLayout(new GridLayout(6, 4, 10, 10)); // 修改为6行以容纳根号按钮
+        panel.setLayout(new GridLayout(5, 4, 10, 10)); // 修改为5行以适应新布局
 
         String[] buttons = {
                 "7", "8", "9", "÷",
@@ -29,10 +29,12 @@ public class Calculator extends JFrame implements ActionListener {
         };
 
         for (String text : buttons) {
-            JButton button = new JButton(text);
-            button.setFont(new Font("Arial", Font.BOLD, 18)); // 增加按钮字体大小
-            button.addActionListener(this);
-            panel.add(button);
+            if (!text.isEmpty()) { // 确保不创建空按钮
+                JButton button = new JButton(text);
+                button.setFont(new Font("Arial", Font.BOLD, 18)); // 增加按钮字体大小
+                button.addActionListener(this);
+                panel.add(button);
+            }
         }
 
         add(panel, BorderLayout.CENTER);
@@ -115,7 +117,11 @@ public class Calculator extends JFrame implements ActionListener {
         try {
             double num = Double.parseDouble(textField.getText());
             result = Math.sqrt(num);
-            textField.setText(String.valueOf(result));
+            if (result == Math.floor(result)) { // 检查结果是否已经是整数
+                textField.setText(String.valueOf((int) result)); // 转换为整数并显示
+            } else {
+                textField.setText(String.valueOf(result)); // 否则显示浮点数
+            }
         } catch (NumberFormatException ex) {
             JOptionPane.showMessageDialog(this, "请输入一个有效的数字");
         }