|
|
@ -12,6 +12,7 @@ import com.fr.design.mainframe.FormArea; |
|
|
|
import com.fr.design.mainframe.FormDesigner; |
|
|
|
import com.fr.design.mainframe.FormDesigner; |
|
|
|
import com.fr.design.mainframe.WidgetPropertyPane; |
|
|
|
import com.fr.design.mainframe.WidgetPropertyPane; |
|
|
|
import com.fr.design.utils.gui.LayoutUtils; |
|
|
|
import com.fr.design.utils.gui.LayoutUtils; |
|
|
|
|
|
|
|
import com.fr.form.ui.ElementCaseImage; |
|
|
|
import com.fr.form.ui.PaddingMargin; |
|
|
|
import com.fr.form.ui.PaddingMargin; |
|
|
|
import com.fr.form.ui.Widget; |
|
|
|
import com.fr.form.ui.Widget; |
|
|
|
import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget; |
|
|
|
import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget; |
|
|
@ -683,6 +684,7 @@ public class XWFitLayout extends XLayoutContainer { |
|
|
|
for (int i=0, num=layout.getWidgetCount(); i<num ; i++) { |
|
|
|
for (int i=0, num=layout.getWidgetCount(); i<num ; i++) { |
|
|
|
BoundsWidget bw = (BoundsWidget)layout.getWidget(i); |
|
|
|
BoundsWidget bw = (BoundsWidget)layout.getWidget(i); |
|
|
|
if (bw != null) { |
|
|
|
if (bw != null) { |
|
|
|
|
|
|
|
ElementCaseImage.adjustImageSize(bw); |
|
|
|
Rectangle bounds = bw.getBounds(); |
|
|
|
Rectangle bounds = bw.getBounds(); |
|
|
|
bw.setBackupBounds(bounds); |
|
|
|
bw.setBackupBounds(bounds); |
|
|
|
XWidgetCreator comp = (XWidgetCreator) XCreatorUtils.createXCreator(bw.getWidget()); |
|
|
|
XWidgetCreator comp = (XWidgetCreator) XCreatorUtils.createXCreator(bw.getWidget()); |
|
|
@ -766,6 +768,7 @@ public class XWFitLayout extends XLayoutContainer { |
|
|
|
Rectangle rec = recalculateWidgetBounds(wgtBound, hors, veris); |
|
|
|
Rectangle rec = recalculateWidgetBounds(wgtBound, hors, veris); |
|
|
|
wgt.setBounds(rec); |
|
|
|
wgt.setBounds(rec); |
|
|
|
creator.toData().updateChildBounds(rec); |
|
|
|
creator.toData().updateChildBounds(rec); |
|
|
|
|
|
|
|
XElementCase.updateECImage(creator); |
|
|
|
if (rec.x == 0) { |
|
|
|
if (rec.x == 0) { |
|
|
|
containerHeight += rec.height; |
|
|
|
containerHeight += rec.height; |
|
|
|
} |
|
|
|
} |
|
|
|