重构FRLeftFlowLayout、TreeRootPane

designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java

@@ -1,16 +1,13 @@
 package com.fr.design.gui.itree.refreshabletree;
 
-import com.fr.base.i18n.BidiUtils;
 import com.fr.data.impl.TreeAttr;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.FRGUIPaneFactory;
-import groovy.swing.factory.LayoutFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JPanel;
-import java.awt.FlowLayout;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -35,7 +32,7 @@ public class TreeRootPane extends BasicPane {
     public TreeRootPane() {
         this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
 
-        JPanel checkTypePane = BidiUtils.rtl() ? FRGUIPaneFactory.createTrailingFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
+        JPanel checkTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
         checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not"));
         checkTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@@ -43,7 +40,7 @@ public class TreeRootPane extends BasicPane {
         checkTypePane.add(checkTypeCheckBox);
         this.add(checkTypePane);
 
-        JPanel loadTypePane = BidiUtils.rtl() ? FRGUIPaneFactory.createTrailingFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
+        JPanel loadTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
         checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async"));
         loadTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@@ -51,14 +48,14 @@ public class TreeRootPane extends BasicPane {
         loadTypePane.add(loadTypeCheckBox);
         this.add(loadTypePane);
 
-        JPanel leafSelectPane = BidiUtils.rtl() ? FRGUIPaneFactory.createTrailingFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
+        JPanel leafSelectPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
         checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         leafSelectPane.add(layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only")));
         layerTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
         this.add(leafSelectPane);
 
-        JPanel returnFullPathPane = BidiUtils.rtl() ? FRGUIPaneFactory.createTrailingFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
+        JPanel returnFullPathPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
         checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path")));
         returnFullPathCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

designer-base/src/main/java/com/fr/design/layout/FRLeftFlowLayout.java

@@ -18,7 +18,7 @@ public class FRLeftFlowLayout extends FlowLayout {
 	 public void layoutContainer(Container target) {
 	      synchronized (target.getTreeLock()) {
 		Insets insets = target.getInsets();
-		int maxwidth = target.getWidth() - (insets.left + insets.right + getHgap()*2);
+		int maxwidth = target.getPreferredSize().width - (insets.left + insets.right + getHgap()*2);
 		int nmembers = target.getComponentCount();
 		int x = 0, y = insets.top + getVgap();
 		int rowh = 0, start = 0;