fanruan
/
design
6
1
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

REPORT-3163 合作开发9.0设计器=>交换弹出工具条的上下按钮

master
plough 8 years ago
parent
a914c62961
commit
abba216587
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

14
designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
Unescape View File

@ -249,7 +249,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
propertyPanel = new JPanel(); propertyPanel = new JPanel();
propertyPanel.setBackground(Color.pink); propertyPanel.setBackground(Color.pink);
contentPane = generateContentPane(); contentPane = generateContentPane();
popupToolPane = new PopupToolPane(this, PopupToolPane.UP_BUTTON); popupToolPane = new PopupToolPane(this, PopupToolPane.DOWN_BUTTON);
propertyPanel.setLayout(new BorderLayout()); propertyPanel.setLayout(new BorderLayout());
propertyPanel.add(popupToolPane, BorderLayout.NORTH); propertyPanel.add(popupToolPane, BorderLayout.NORTH);
propertyPanel.add(contentPane, BorderLayout.CENTER); propertyPanel.add(contentPane, BorderLayout.CENTER);
@ -466,9 +466,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
return; return;
} }
if (buttonType.equals(UP_BUTTON)) { if (buttonType.equals(DOWN_BUTTON)) {
} else if (buttonType.equals(DOWN_BUTTON)) { } else if (buttonType.equals(UP_BUTTON)) {
} else { } else {
throw new IllegalArgumentException("unknown button type: " + buttonType); throw new IllegalArgumentException("unknown button type: " + buttonType);
@ -554,9 +554,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
// 触发弹入、弹出 // 触发弹入、弹出
private void onPop() { private void onPop() {
if (buttonType.equals(UP_BUTTON)) { if (buttonType.equals(DOWN_BUTTON)) {
propertyItem.popupDialog(); propertyItem.popupDialog();
} else if (buttonType.equals(DOWN_BUTTON)) { } else if (buttonType.equals(UP_BUTTON)) {
propertyItem.popToFrame(); propertyItem.popToFrame();
} }
} }
@ -578,7 +578,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
if (buttonType.equals(NO_BUTTON)) { if (buttonType.equals(NO_BUTTON)) {
return; return;
} }
if (buttonType.equals(UP_BUTTON)) { if (buttonType.equals(DOWN_BUTTON)) {
if (model == UIConstants.MODEL_NORMAL) { if (model == UIConstants.MODEL_NORMAL) {
button = UIConstants.DRAG_LEFT_NORMAL; button = UIConstants.DRAG_LEFT_NORMAL;
} else { } else {
@ -608,7 +608,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
super(DesignerContext.getDesignerFrame()); super(DesignerContext.getDesignerFrame());
container = getContentPane(); container = getContentPane();
setUndecorated(true); setUndecorated(true);
PopupToolPane popupToolPane = new PopupToolPane(propertyItem, PopupToolPane.DOWN_BUTTON); PopupToolPane popupToolPane = new PopupToolPane(propertyItem, PopupToolPane.UP_BUTTON);
popupToolPane.setParentDialog(this); popupToolPane.setParentDialog(this);
contentPane = propertyItem.getContentPane(); contentPane = propertyItem.getContentPane();
container.add(popupToolPane, BorderLayout.NORTH); container.add(popupToolPane, BorderLayout.NORTH);

Write Preview
Loading…
Cancel
Save