Browse Source

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

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

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

9
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) {
if (e.getButton() == MouseEvent.BUTTON1 && e.getX() > 0 && e.getY() > 0) {
Direction dir = selectionModel.getDirectionAt(e);
if (!DesignerMode.isAuthorityEditing()) {
@ -177,13 +177,10 @@ public class EditingMouseListener extends MouseInputAdapter {
if (designer.isDrawLineMode()) {
designer.updateDrawLineMode(e);
} else {
int relativeX = Math.max(0, e.getX());
int relativeY = Math.max(0, e.getY());
if (selectionModel.hasSelectionComponent()
&& selectionModel.getSelection().getRelativeBounds().contains(
designer.getHorizontalScaleValue() + relativeX,
designer.getVerticalScaleValue() + relativeY)) {
designer.getHorizontalScaleValue() + e.getX(),
designer.getVerticalScaleValue() + e.getY())) {
lastPressEvent = e;
lastXCreator = selectionModel.getSelection().getSelectedCreator();
} else {

Loading…
Cancel
Save