Browse Source

Pull request #2442: REPORT-40553 决策报表-连续点击空白设计面板,body没有处于未选中状态

Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit 'ae699c5dd8b456b46cd7b7eb393fbf871fb398ec':
  REPORT-40553 决策报表-连续点击空白设计面板,body没有处于未选中状态
feature/big-screen
ju.ju 4 years ago
parent
commit
27243de772
  1. 11
      designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

11
designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

@ -166,7 +166,7 @@ public class EditingMouseListener extends MouseInputAdapter {
// 获取焦点,以便获取热键
designer.requestFocus();
}
if (e.getButton() == MouseEvent.BUTTON1 && e.getX() > 0 && e.getY() > 0) {
if (e.getButton() == MouseEvent.BUTTON1 && !beyondValidArea(e)) {
Direction dir = selectionModel.getDirectionAt(e);
if (!DesignerMode.isAuthorityEditing()) {
@ -194,6 +194,15 @@ public class EditingMouseListener extends MouseInputAdapter {
e.translatePoint(oldX - e.getX(), oldY - e.getY());
}
private boolean beyondValidArea(MouseEvent e) {
if (e.getX() < 0 || e.getY() < 0 ||
e.getX() > designer.getRootComponent().getWidth() ||
e.getY() > (designer.getRootComponent().getHeight() + designer.getParaHeight())) {
return true;
}
return false;
}
private void offsetEventPoint(MouseEvent e){
int x = designer.getRelativeX(e.getX());
int y = designer.getRelativeY(e.getY());

Loading…
Cancel
Save