Browse Source

Pull request #8312: REPORT-68175 release合并final

Merge in DESIGN/design from ~FANGLEI/design:final/11.0 to final/11.0

* commit 'e538a18d39cd372f4c7a06b363f0e83c5791a012':
  REPORT-68175 release合并final
new-design
fanglei 3 years ago
parent
commit
78075c7669
  1. 6
      designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java
  2. 3
      designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java

6
designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java

@ -4,6 +4,7 @@ import com.fr.design.beans.GroupModel;
import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.beans.ConstraintsGroupModel;
import com.fr.design.designer.beans.HoverPainter; import com.fr.design.designer.beans.HoverPainter;
import com.fr.design.designer.beans.models.DraggingModel; import com.fr.design.designer.beans.models.DraggingModel;
import com.fr.design.designer.beans.models.StateModel;
import com.fr.design.designer.beans.painters.FRAbsoluteLayoutPainter; import com.fr.design.designer.beans.painters.FRAbsoluteLayoutPainter;
import com.fr.design.designer.creator.*; import com.fr.design.designer.creator.*;
import com.fr.design.designer.properties.BoundsGroupModel; import com.fr.design.designer.properties.BoundsGroupModel;
@ -353,7 +354,10 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
public void dragging(DraggingModel model) { public void dragging(DraggingModel model) {
FormDesigner designer = model.getDesigner(); FormDesigner designer = model.getDesigner();
MouseEvent dragEvent = model.getCurrentDragEvent(); MouseEvent dragEvent = model.getCurrentDragEvent();
designer.getStateModel().dragging(dragEvent); StateModel stateModel = designer.getStateModel();
if (stateModel.dragable()) {
stateModel.dragging(dragEvent);
}
} }
@Override @Override

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

@ -224,6 +224,9 @@ public class FormDesignerUI extends ComponentUI {
} }
XCreator creator = draggingModel.getCreator(); XCreator creator = draggingModel.getCreator();
if (!creator.isSupportDrag()) {
return false;
}
int leftTopX = draggingModel.getCreatorLeftTopX(); int leftTopX = draggingModel.getCreatorLeftTopX();
int leftTopY = draggingModel.getCreatorLeftTopY(); int leftTopY = draggingModel.getCreatorLeftTopY();

Loading…
Cancel
Save