diff --git a/src/gui/UI_LenheartUI/DamageControl.java b/src/gui/UI_LenheartUI/DamageControl.java index 7ad47bc..31fa22d 100644 --- a/src/gui/UI_LenheartUI/DamageControl.java +++ b/src/gui/UI_LenheartUI/DamageControl.java @@ -4,6 +4,7 @@ package gui.UI_LenheartUI; +<<<<<<< HEAD import com.alibaba.fastjson.JSONObject; import gui.Start; import gui.特殊控制台; @@ -17,11 +18,16 @@ import java.util.Map; import javax.swing.*; import javax.swing.event.*; import javax.swing.table.*; +======= +import java.awt.*; +import javax.swing.*; +>>>>>>> 9b110d92d145ad7a1d71946760ffa3fab1c155e2 /** * @author dongj */ public class DamageControl extends JPanel { +<<<<<<< HEAD //伤害控制配置 public static JSONObject Config; //JTableList @@ -651,6 +657,18 @@ public class DamageControl extends JPanel { add(button19); button19.setBounds(520, 645, 160, 35); +======= + public DamageControl() { + initComponents(); + } + + private void initComponents() { + // JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents @formatter:off + + //======== this ======== + setLayout(null); + +>>>>>>> 9b110d92d145ad7a1d71946760ffa3fab1c155e2 { // compute preferred size Dimension preferredSize = new Dimension(); @@ -669,6 +687,7 @@ public class DamageControl extends JPanel { } // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables @formatter:off +<<<<<<< HEAD private JScrollPane scrollPane1; private JTable table1; private JScrollPane scrollPane2; @@ -718,5 +737,7 @@ public class DamageControl extends JPanel { private JToggleButton toggleButton2; private JToggleButton toggleButton3; private JButton button19; +======= +>>>>>>> 9b110d92d145ad7a1d71946760ffa3fab1c155e2 // JFormDesigner - End of variables declaration //GEN-END:variables @formatter:on } diff --git a/src/gui/UI_LenheartUI/DamageControl.jfd b/src/gui/UI_LenheartUI/DamageControl.jfd index 6013c93..9582878 100644 --- a/src/gui/UI_LenheartUI/DamageControl.jfd +++ b/src/gui/UI_LenheartUI/DamageControl.jfd @@ -5,6 +5,7 @@ new FormModel { root: new FormRoot { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class com.jformdesigner.runtime.NullLayout ) ) { name: "this" +<<<<<<< HEAD "border": sfield com.jformdesigner.model.FormObject NULL_VALUE add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane1" @@ -537,6 +538,11 @@ new FormModel { }, new FormLayoutConstraints( null ) { "location": new java.awt.Point( 0, 0 ) "size": new java.awt.Dimension( 1900, 875 ) +======= + }, new FormLayoutConstraints( null ) { + "location": new java.awt.Point( 0, 0 ) + "size": new java.awt.Dimension( 400, 300 ) +>>>>>>> 9b110d92d145ad7a1d71946760ffa3fab1c155e2 } ) } } diff --git a/src/gui/UI_LenheartUI/ItemRecovery.java b/src/gui/UI_LenheartUI/ItemRecovery.java index d957953..1494dc5 100644 --- a/src/gui/UI_LenheartUI/ItemRecovery.java +++ b/src/gui/UI_LenheartUI/ItemRecovery.java @@ -4,6 +4,7 @@ package gui.UI_LenheartUI; +<<<<<<< HEAD import java.awt.event.*; import gui.Start; import gui.特殊控制台; @@ -17,6 +18,10 @@ import javax.swing.*; import javax.swing.border.*; import javax.swing.table.*; import javax.swing.table.TableColumn; +======= +import java.awt.*; +import javax.swing.*; +>>>>>>> 9b110d92d145ad7a1d71946760ffa3fab1c155e2 /** * @author dongj @@ -26,6 +31,7 @@ public class ItemRecovery extends JPanel { initComponents(); } +<<<<<<< HEAD private void 删除按钮(ActionEvent e) { int selectedRow = ItemTable.getSelectedRow(); if (selectedRow != -1) { @@ -69,10 +75,15 @@ public class ItemRecovery extends JPanel { 删除按钮 = new JButton(); 保存配置 = new JButton(); 新增按钮 = new JButton(); +======= + private void initComponents() { + // JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents @formatter:off +>>>>>>> 9b110d92d145ad7a1d71946760ffa3fab1c155e2 //======== this ======== setLayout(null); +<<<<<<< HEAD //======== scrollPane1 ======== { @@ -152,5 +163,25 @@ public class ItemRecovery extends JPanel { private JButton 删除按钮; private JButton 保存配置; private JButton 新增按钮; +======= + { + // compute preferred size + Dimension preferredSize = new Dimension(); + for(int i = 0; i < getComponentCount(); i++) { + Rectangle bounds = getComponent(i).getBounds(); + preferredSize.width = Math.max(bounds.x + bounds.width, preferredSize.width); + preferredSize.height = Math.max(bounds.y + bounds.height, preferredSize.height); + } + Insets insets = getInsets(); + preferredSize.width += insets.right; + preferredSize.height += insets.bottom; + setMinimumSize(preferredSize); + setPreferredSize(preferredSize); + } + // JFormDesigner - End of component initialization //GEN-END:initComponents @formatter:on + } + + // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables @formatter:off +>>>>>>> 9b110d92d145ad7a1d71946760ffa3fab1c155e2 // JFormDesigner - End of variables declaration //GEN-END:variables @formatter:on } diff --git a/src/gui/UI_LenheartUI/ItemRecovery.jfd b/src/gui/UI_LenheartUI/ItemRecovery.jfd index ff891d6..4c5b2e2 100644 --- a/src/gui/UI_LenheartUI/ItemRecovery.jfd +++ b/src/gui/UI_LenheartUI/ItemRecovery.jfd @@ -3,6 +3,7 @@ JFDML JFormDesigner: "9.0.0.0.352" Java: "21.0.6" encoding: "UTF-8" new FormModel { contentType: "form/swing" root: new FormRoot { +<<<<<<< HEAD add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class com.jformdesigner.runtime.NullLayout ) { "autoSize": false } ) { @@ -74,6 +75,13 @@ new FormModel { }, new FormLayoutConstraints( null ) { "location": new java.awt.Point( 0, 0 ) "size": new java.awt.Dimension( 1640, 695 ) +======= + add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class com.jformdesigner.runtime.NullLayout ) ) { + name: "this" + }, new FormLayoutConstraints( null ) { + "location": new java.awt.Point( 0, 0 ) + "size": new java.awt.Dimension( 400, 300 ) +>>>>>>> 9b110d92d145ad7a1d71946760ffa3fab1c155e2 } ) } } diff --git a/src/gui/UI_LenheartUI/UI_LenheartUI.java b/src/gui/UI_LenheartUI/UI_LenheartUI.java index 85747b3..9acf147 100644 --- a/src/gui/UI_LenheartUI/UI_LenheartUI.java +++ b/src/gui/UI_LenheartUI/UI_LenheartUI.java @@ -2,6 +2,7 @@ package gui.UI_LenheartUI; import javax.swing.*; +<<<<<<< HEAD public class UI_LenheartUI { private JPanel 物品回收页面; @@ -11,5 +12,11 @@ public class UI_LenheartUI { 伤害控制页面 = new DamageControl(); mainComponent.addTab("物品回收设置", 物品回收页面); mainComponent.addTab("伤害控制设置", 伤害控制页面); +======= +public class LenheartUI { + + public LenheartUI(JTabbedPane mainComponent) { + +>>>>>>> 9b110d92d145ad7a1d71946760ffa3fab1c155e2 } }