Browse Source

REPORT-37353【frm设计界面支持缩放】缩放过程中,如果进行图表编辑,拖动滚动条,就会重叠

feature/big-screen
kerry 4 years ago
parent
commit
81bfa13576
  1. 4
      designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java
  2. 8
      designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java

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

@ -685,8 +685,8 @@ public class EditingMouseListener extends MouseInputAdapter {
Rectangle rect = ComponentUtils.getRelativeBounds(currentXCreator); Rectangle rect = ComponentUtils.getRelativeBounds(currentXCreator);
Rectangle bounds = new Rectangle(1, 1, currentXCreator.getWidth() - 2, currentXCreator.getHeight() - 2); Rectangle bounds = new Rectangle(1, 1, currentXCreator.getWidth() - 2, currentXCreator.getHeight() - 2);
bounds.x += (rect.x - designer.getArea().getHorizontalValue()); bounds.x += (rect.x - designer.getHorizontalScaleValue());
bounds.y += (rect.y - designer.getArea().getVerticalValue()); bounds.y += (rect.y - designer.getVerticalScaleValue());
if (currentXCreator instanceof XEditorHolder) { if (currentXCreator instanceof XEditorHolder) {
ToolTipEditor.getInstance().resetBounds((XEditorHolder) currentXCreator, bounds, currentEditor.getEditorTarget().getBounds()); ToolTipEditor.getInstance().resetBounds((XEditorHolder) currentXCreator, bounds, currentEditor.getEditorTarget().getBounds());
} }

8
designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java

@ -177,13 +177,13 @@ public class FormDesignerUI extends ComponentUI {
if (k == 1 || k == 2) { if (k == 1 || k == 2) {
x1 = 0; x1 = 0;
x2 = 6; x2 = 6;
y2 = y1 = bounds.y - designer.getArea().getVerticalValue() + (k == 1 ? 0 : bounds.height); y2 = y1 = bounds.y - designer.getVerticalScaleValue() + (k == 1 ? 0 : bounds.height);
text = Utils.objectToString(y1 + designer.getArea().getVerticalValue()); text = Utils.objectToString(bounds.y);
} else { } else {
y1 = 0; y1 = 0;
y2 = 6; y2 = 6;
x1 = x2 = bounds.x - designer.getArea().getHorizontalValue() + (k == 3 ? 0 : bounds.width); x1 = x2 = bounds.x - designer.getHorizontalScaleValue()+ (k == 3 ? 0 : bounds.width);
text = Utils.objectToString(x1 + designer.getArea().getHorizontalValue()); text = Utils.objectToString(bounds.x);
} }
text += com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel"); text += com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel");
g2d.setColor(XCreatorConstants.RESIZE_BOX_BORDER_COLOR); g2d.setColor(XCreatorConstants.RESIZE_BOX_BORDER_COLOR);

Loading…
Cancel
Save