From 4eda8b556646482f41b9ecf11138ee0a2021c7d5 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 17 Jul 2017 09:59:41 +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>=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=BC=B9=E7=AA=97=E7=9A=84=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/EastRegionContainerPane.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index baef0d069d..97d6cc28b2 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -9,6 +9,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.FRFont;
+import ij.gui.Toolbar;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -324,7 +325,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         // 弹出对话框
         public void popupFixedPane() {
             if (popupPane == null) {
-                popupPane = new FixedPopupPane(contentPane);
+                popupPane = new FixedPopupPane(this);
             }
             GUICoreUtils.showPopupMenu(popupPane, button, -popupPane.getPreferredSize().width, 0);
         }
@@ -332,9 +333,11 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 
     private class FixedPopupPane extends JPopupMenu {
         private JComponent contentPane;
-        FixedPopupPane(JComponent contentPane) {
-            this.contentPane = contentPane;
+        FixedPopupPane(PropertyItem propertyItem) {
+            contentPane = propertyItem.getContentPane();
+            this.add(new PopupToolPane(propertyItem));
             this.add(contentPane);
+            this.setOpaque(false);
             this.setPreferredSize(new Dimension(CONTAINER_WIDTH - TAB_WIDTH, getPreferredSize().height));
         }