Browse Source

Pull request #7649: REPORT-65976 复用组件-绝对布局拖入绝对画布块的组件,绝对画布块里的子组件没有随着绝对画布块的尺寸进行缩放,比绝对画布块小;拖入到占位块里是正常充满的

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

* commit '0cdccd2af200b2692897158466a29d2c2daf00ed':
  代码修改
bugfix/11.0
kerry 3 years ago
parent
commit
bce69813b5
  1. 5
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/PreviewWidgetBlock.java

5
designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/PreviewWidgetBlock.java

@ -2,7 +2,6 @@ package com.fr.design.mainframe.share.ui.block;
import com.fr.concurrent.NamedThreadFactory; import com.fr.concurrent.NamedThreadFactory;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.fit.common.TemplateTool;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.EastRegionContainerPane; import com.fr.design.mainframe.EastRegionContainerPane;
@ -291,11 +290,7 @@ public abstract class PreviewWidgetBlock<T> extends JPanel implements MouseListe
} }
//新自适应的模板由于内部的尺寸都是未经过缩放过的值,所以对应的设计分辨率值也要保持正常分辨率p1440
protected void compatibleProcessAbsoluteLayoutResolution(Widget widget) { protected void compatibleProcessAbsoluteLayoutResolution(Widget widget) {
if (!TemplateTool.isCurrentEditingNewJForm()) {
return;
}
Form.traversalWidget(widget, new WidgetGather() { Form.traversalWidget(widget, new WidgetGather() {
@Override @Override
public void dealWith(Widget widget) { public void dealWith(Widget widget) {

Loading…
Cancel
Save