|
|
@ -11,6 +11,7 @@ import com.fr.design.designer.beans.painters.FRFitLayoutPainter; |
|
|
|
import com.fr.design.designer.creator.XCreator; |
|
|
|
import com.fr.design.designer.creator.XCreator; |
|
|
|
import com.fr.design.designer.creator.XCreatorUtils; |
|
|
|
import com.fr.design.designer.creator.XCreatorUtils; |
|
|
|
import com.fr.design.designer.creator.XLayoutContainer; |
|
|
|
import com.fr.design.designer.creator.XLayoutContainer; |
|
|
|
|
|
|
|
import com.fr.design.designer.creator.XWAbsoluteBodyLayout; |
|
|
|
import com.fr.design.designer.creator.XWAbsoluteLayout; |
|
|
|
import com.fr.design.designer.creator.XWAbsoluteLayout; |
|
|
|
import com.fr.design.designer.creator.XWFitLayout; |
|
|
|
import com.fr.design.designer.creator.XWFitLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWCardLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWCardLayout; |
|
|
@ -339,6 +340,10 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter { |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void fix(XCreator creator) { |
|
|
|
public void fix(XCreator creator) { |
|
|
|
|
|
|
|
//XWAbsoluteBodyLayout作为body不允许在Fit布局中调整尺寸
|
|
|
|
|
|
|
|
if(creator.acceptType(XWAbsoluteBodyLayout.class)){ |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
//拖拽组件原大小、位置
|
|
|
|
//拖拽组件原大小、位置
|
|
|
|
Rectangle backupBound = creator.getBackupBound(); |
|
|
|
Rectangle backupBound = creator.getBackupBound(); |
|
|
|
backupBound.x -= container.getX(); |
|
|
|
backupBound.x -= container.getX(); |
|
|
|