Browse Source

REPORT-5284 公测客户反馈设计器配色和交互问题修改=>点击添加事件或者添加条件、超链的时候直接打开新建项的弹窗

master
plough 7 years ago
parent
commit
7949cb2ecf
  1. 11
      designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

11
designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@ -330,6 +330,7 @@ public abstract class UIListControlPane extends UIControlPane {
nameableList.ensureIndexIsVisible(index); nameableList.ensureIndexIsVisible(index);
nameEdList.repaint(); nameEdList.repaint();
popupEditDialog();
} }
/** /**
@ -400,15 +401,19 @@ public abstract class UIListControlPane extends UIControlPane {
} }
} }
private void popupEditDialog() {
popupEditDialog(null);
}
protected void popupEditDialog(Point mousePos) { protected void popupEditDialog(Point mousePos) {
if (isNewStyle()) { if (isNewStyle()) {
Rectangle currentCellBounds = nameableList.getCellBounds(editingIndex, editingIndex); Rectangle currentCellBounds = nameableList.getCellBounds(editingIndex, editingIndex);
if (editingIndex < 0 || !currentCellBounds.contains(mousePos)) { if (editingIndex < 0 || (mousePos != null && !currentCellBounds.contains(mousePos))) {
return; return;
} }
popupEditDialog.setLocation(getPopupDialogLocation()); popupEditDialog.setLocation(getPopupDialogLocation());
if (popupEditDialog instanceof PopupEditDialog) { if (popupEditDialog instanceof PopupEditDialog) {
((PopupEditDialog)popupEditDialog).setTitle(selectedName); ((PopupEditDialog)popupEditDialog).setTitle(getSelectedName());
} }
popupEditDialog.setVisible(true); popupEditDialog.setVisible(true);
} }
@ -418,7 +423,7 @@ public abstract class UIListControlPane extends UIControlPane {
Point resultPos = new Point(0, 0); Point resultPos = new Point(0, 0);
Point listPos = nameableList.getLocationOnScreen(); Point listPos = nameableList.getLocationOnScreen();
resultPos.x = listPos.x - popupEditDialog.getWidth(); resultPos.x = listPos.x - popupEditDialog.getWidth();
resultPos.y = listPos.y + (editingIndex - 1) * EDIT_RANGE; resultPos.y = listPos.y + (nameableList.getSelectedIndex() - 1) * EDIT_RANGE;
// 当对象在屏幕上的位置比较靠下时,往下移动弹窗至与属性面板平齐 // 当对象在屏幕上的位置比较靠下时,往下移动弹窗至与属性面板平齐
Window frame = DesignerContext.getDesignerFrame(); Window frame = DesignerContext.getDesignerFrame();

Loading…
Cancel
Save