Browse Source

代码修改

master
kerry 8 years ago
parent
commit
f6ef244651
  1. 2
      designer/src/com/fr/design/widget/ui/btn/ButtonSytleDefinedPane.java
  2. 6
      designer_base/src/com/fr/design/style/background/BackgroundButtonPane.java
  3. 2
      designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleImgBackgroundEditor.java

2
designer/src/com/fr/design/widget/ui/btn/ButtonSytleDefinedPane.java

@ -106,9 +106,7 @@ public class ButtonSytleDefinedPane extends BasicPane {
editButton.addActionListener(new ActionListener() { editButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if (choosePane == null) {
choosePane = new BackgroundButtonPane(); choosePane = new BackgroundButtonPane();
}
BasicDialog dlg = choosePane.showWindow(SwingUtilities BasicDialog dlg = choosePane.showWindow(SwingUtilities
.getWindowAncestor(ButtonSytleDefinedPane.this)); .getWindowAncestor(ButtonSytleDefinedPane.this));
dlg.addDialogActionListener(new DialogActionAdapter() { dlg.addDialogActionListener(new DialogActionAdapter() {

6
designer_base/src/com/fr/design/style/background/BackgroundButtonPane.java

@ -4,8 +4,6 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Background; import com.fr.general.Background;
import com.fr.general.Inter; import com.fr.general.Inter;
import java.util.HashMap;
/** /**
* Created by ibm on 2017/1/5. * Created by ibm on 2017/1/5.
*/ */
@ -52,8 +50,4 @@ public class BackgroundButtonPane extends BackgroundPane {
return quickPane; return quickPane;
} }
public void populate(Background background) {
cacheMap = new HashMap<>();
super.populate(background);
}
} }

2
designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleImgBackgroundEditor.java

@ -18,10 +18,8 @@ public class AccessibleImgBackgroundEditor extends UneditableAccessibleEditor {
@Override @Override
protected void showEditorPane() { protected void showEditorPane() {
if (choosePane == null) {
choosePane = new BackgroundButtonPane(); choosePane = new BackgroundButtonPane();
choosePane.setPreferredSize(new Dimension(600, 400)); choosePane.setPreferredSize(new Dimension(600, 400));
}
BasicDialog dlg = choosePane.showWindow(SwingUtilities.getWindowAncestor(this)); BasicDialog dlg = choosePane.showWindow(SwingUtilities.getWindowAncestor(this));
dlg.addDialogActionListener(new DialogActionAdapter() { dlg.addDialogActionListener(new DialogActionAdapter() {

Loading…
Cancel
Save