Browse Source

REPORT-1814 表单tab块的改良bug

pmd
master
zhouping 8 years ago
parent
commit
5dcbc23681
  1. 34
      designer_form/src/com/fr/design/mainframe/EditingMouseListener.java

34
designer_form/src/com/fr/design/mainframe/EditingMouseListener.java

@ -187,6 +187,14 @@ public class EditingMouseListener extends MouseInputAdapter {
designer.selectComponents(e); designer.selectComponents(e);
} }
if (stateModel.isDragging()) { if (stateModel.isDragging()) {
mouseDraggingRelease(e);
}
}
lastPressEvent = null;
last_creator = null;
}
private void mouseDraggingRelease(MouseEvent e) {
// 当前鼠标所在的组件 // 当前鼠标所在的组件
XCreator hoveredComponent = designer.getComponentAt(e.getX(), e.getY()); XCreator hoveredComponent = designer.getComponentAt(e.getX(), e.getY());
if(designer.isWidgetsIntersect() && dragBackupBounds != null && hoveredComponent != null){ if(designer.isWidgetsIntersect() && dragBackupBounds != null && hoveredComponent != null){
@ -218,13 +226,8 @@ public class EditingMouseListener extends MouseInputAdapter {
designer.setPainter(null); designer.setPainter(null);
} }
cancelPromptWidgetForbidEnter(); cancelPromptWidgetForbidEnter();
}
} }
} }
lastPressEvent = null;
last_creator = null;
}
/** /**
* 激活上下文菜单待完善 * 激活上下文菜单待完善
@ -286,9 +289,20 @@ public class EditingMouseListener extends MouseInputAdapter {
} }
if (component.isReport()) { if (component.isReport()) {
elementCaseMouseMoved(e, component);
designer.repaint();
return;
}
processChartEditorMouseMove(component, e);
designer.repaint();
}
private void elementCaseMouseMoved(MouseEvent e, XCreator component) {
xElementCase = (XElementCase)component; xElementCase = (XElementCase)component;
UIButton button = (UIButton)xElementCase.getCoverPane().getComponent(0); UIButton button = (UIButton)xElementCase.getCoverPane().getComponent(0);
if(designer.getCursor().getType() ==Cursor.HAND_CURSOR) { if(designer.getCursor().getType() == Cursor.HAND_CURSOR) {
designer.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); designer.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
} // component.getParent() 是报表块所在的XWTitleLayout } // component.getParent() 是报表块所在的XWTitleLayout
int minX = button.getX() + getParentPositionX(component, 0) - designer.getArea().getHorizontalValue(); int minX = button.getX() + getParentPositionX(component, 0) - designer.getArea().getHorizontalValue();
@ -312,14 +326,6 @@ public class EditingMouseListener extends MouseInputAdapter {
} }
xElementCase.displayCoverPane(true); xElementCase.displayCoverPane(true);
xElementCase.setDirections(Direction.TOP_BOTTOM_LEFT_RIGHT); xElementCase.setDirections(Direction.TOP_BOTTOM_LEFT_RIGHT);
designer.repaint();
return;
}
processChartEditorMouseMove(component, e);
designer.repaint();
} }
private void setCoverPaneNotDisplay(MouseEvent e, boolean isLinkedHelpDialog) { private void setCoverPaneNotDisplay(MouseEvent e, boolean isLinkedHelpDialog) {

Loading…
Cancel
Save