From d6d632aedc8bfe8eb321a7f3d5dcf58968b6dcab Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Thu, 13 Jul 2017 14:48:23 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E4=BD=BF=E7=94=A8UI?=
 =?UTF-8?q?Button=E4=BD=9C=E4=B8=BA=E7=AB=96=E5=90=91tab=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../icontainer/UIEastResizableContainer.java  | 12 ++++---
 .../mainframe/EastRegionContainerPane.java    | 33 +++++++++++++++----
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java b/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java
index e1a1c2a167..ae7c92fd92 100644
--- a/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java
+++ b/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java
@@ -33,7 +33,7 @@ public class UIEastResizableContainer extends JPanel {
     private static final int ARROW_MARGIN = 15;
     private static final int ARROW_RANGE = 35;
 
-    private boolean isRightPaneVisible = true;
+//    private boolean isRightPaneVisible = true;
 
     public UIEastResizableContainer() {
         this(new JPanel(), new JPanel());
@@ -49,11 +49,15 @@ public class UIEastResizableContainer extends JPanel {
         this.preferredWidth = width;
     }
 
-
-    public void setRightPaneVisible(boolean isVisible){
-        this.isRightPaneVisible = isVisible;
+    public boolean isRightPaneVisible() {
+        return containerWidth > leftPaneWidth;
     }
 
+
+//    public void setRightPaneVisible(boolean isVisible){
+//        this.isRightPaneVisible = isVisible;
+//    }
+
     private void setPreferredWidth(int width) {
         this.preferredWidth = width;
     }
diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index 99cf145170..117a257b08 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -5,6 +5,7 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIEastResizableContainer;
 import com.fr.design.gui.icontainer.UIResizableContainer;
+import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.Constants;
 
@@ -90,6 +91,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     // 左侧按钮面板
     private void initLeftPane() {
         leftPane = new JPanel();
+        leftPane.setLayout(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 0));
         for (PropertyItem item : propertyItemList) {
             leftPane.add(item.getButton());
         }
@@ -186,7 +188,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 
     class PropertyItem {
         //        private UIButton button;
-        private JButton button;
+        private UIButton button;
         private String name;
         private JPanel propertyPanel;
         private JComponent contentPane;
@@ -243,20 +245,33 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         }
 
         private void initButton(String btnUrl) {
-            button = new JButton(BaseUtils.readIcon(btnUrl));
+            button = new UIButton(BaseUtils.readIcon(btnUrl)) {
+                public Dimension getPreferredSize() {
+                    return new Dimension(BUTTON_WIDTH, BUTTON_WIDTH);
+                }
+            };
 //            button = new UIButton("btnd\nssdg");
 //            button.set4LargeToolbarButton();
-            button.setPreferredSize(new Dimension(BUTTON_WIDTH, BUTTON_WIDTH));
-            button.setContentAreaFilled(false);
+//            button.setBorder(BorderFactory.createEmptyBorder(0, 40, 0, 0));
+//            button.setMargin(null);
+//            button.setOpaque(false);
+            button.set4LargeToolbarButton();
+//            button.setSize(new Dimension(BUTTON_WIDTH, BUTTON_WIDTH));
+//            button.setPreferredSize(new Dimension(BUTTON_WIDTH, BUTTON_WIDTH));
+//            button.setContentAreaFilled(false);
             button.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    propertyCard.show(rightPane, name);
+                    if (isRightPaneVisible()) {
+                        propertyCard.show(rightPane, name);
+                    } else {
+                        popOut();
+                    }
                 }
             });
         }
 
-        public JButton getButton() {
+        public UIButton getButton() {
             return button;
         }
 
@@ -267,5 +282,11 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         public JPanel getPropertyPanel() {
             return propertyPanel;
         }
+
+        // 弹出对话框
+        public void popOut() {
+            JDialog dialog = new JDialog();
+            dialog.setVisible(true);
+        }
     }
 }
\ No newline at end of file