Browse Source

Pull request #2592: REPORT-39629 组件块显示标题时问号按钮点不到

Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0

* commit '5a69b8cdeefc10fc118a54164d4cf2ea21a5cb14':
  REPORT-39629 组件块显示标题时问号按钮点不到
feature/big-screen
pengda 4 years ago
parent
commit
60e7ffb8ca
  1. 2
      designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

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

@ -384,7 +384,7 @@ public class EditingMouseListener extends MouseInputAdapter {
if (component.getCoverPane().getComponentCount() > 1) { if (component.getCoverPane().getComponentCount() > 1) {
JComponent button1 = (JComponent) component.getCoverPane().getComponent(1); JComponent button1 = (JComponent) component.getCoverPane().getComponent(1);
int minX1 = button1.getX() + getParentPositionX(component, 0) - designer.getHorizontalScaleValue(); int minX1 = button1.getX() + getParentPositionX(component, 0) - designer.getHorizontalScaleValue();
int minY1 = button1.getY() + getParentPositionY(component, 0) - designer.getVerticalScaleValue(); int minY1 = button1.getY() + getParentPositionY(component, 0) - designer.getVerticalScaleValue() + component.getY();
if (e.getX() + GAP - component.getInsets().left > minX1 && e.getX() - GAP - component.getInsets().left < minX1 + button1.getWidth()) { if (e.getX() + GAP - component.getInsets().left > minX1 && e.getX() - GAP - component.getInsets().left < minX1 + button1.getWidth()) {
if (e.getY() + GAP - component.getInsets().top > minY1 && e.getY() - GAP - component.getInsets().top < minY1 + button1.getHeight()) { if (e.getY() + GAP - component.getInsets().top > minY1 && e.getY() - GAP - component.getInsets().top < minY1 + button1.getHeight()) {
designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));

Loading…
Cancel
Save