From b16fc8bffd86ec412a06c60c62d05d0891780d55 Mon Sep 17 00:00:00 2001 From: plough Date: Wed, 27 Sep 2017 11:32:21 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-4868=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=A7=86=E8=A7=89bug=E4=BF=AE=E6=94=B9=EF=BC=88=E4=BA=8C?= =?UTF-8?q?=EF=BC=89=E9=83=A8=E5=88=86=3D>10=20=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/editor/ValueEditorPane.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/designer_base/src/com/fr/design/editor/ValueEditorPane.java b/designer_base/src/com/fr/design/editor/ValueEditorPane.java index 6b2a7fd30..2b46f94fa 100644 --- a/designer_base/src/com/fr/design/editor/ValueEditorPane.java +++ b/designer_base/src/com/fr/design/editor/ValueEditorPane.java @@ -2,16 +2,17 @@ package com.fr.design.editor; import com.fr.base.Formula; import com.fr.design.DesignerEnvManager; +import com.fr.design.dialog.BasicPane; import com.fr.design.editor.editor.*; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.imenu.UIMenuItem; +import com.fr.design.gui.imenu.UIMenuEastAttrItem; +import com.fr.design.gui.imenu.UIPopupEastAttrMenu; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.dialog.BasicPane; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.stable.StringUtils; @@ -136,14 +137,14 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName private JPopupMenu createPopMenu() { - JPopupMenu scate = new JPopupMenu(); + JPopupMenu scate = new UIPopupEastAttrMenu(); if (this.cards == null) { return scate; } for (int i = 0; i < this.cards.length; i++) { - UIMenuItem item = new UIMenuItem(cards[i].getName()); + JMenuItem item = new UIMenuEastAttrItem(cards[i].getName()); final int j = i; item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -162,9 +163,6 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName } }); scate.add(item); - if (i < cards.length - 1) { - scate.addSeparator(); - } } return scate; }