|
|
|
@ -114,6 +114,15 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
|
|
|
|
|
XCreator creator = (XCreator) container.getComponent(i); |
|
|
|
|
creator.updateChildBound(minHeight); |
|
|
|
|
creator.setBackupBound(creator.getBounds()); |
|
|
|
|
//tab布局用到
|
|
|
|
|
ArrayList<?> childrenList = creator.getTargetChildrenList(); |
|
|
|
|
for (int j = 0; j < childrenList.size(); j++) { |
|
|
|
|
XWTabFitLayout tabLayout = (XWTabFitLayout) childrenList.get(j); |
|
|
|
|
for (int m = 0; m < tabLayout.getComponentCount(); m++) { |
|
|
|
|
XCreator childCreator = tabLayout.getXCreator(m); |
|
|
|
|
childCreator.setBackupBound(childCreator.getBounds()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -1039,15 +1048,22 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
|
|
|
|
|
XWTabFitLayout tabLayout = (XWTabFitLayout) childrenList.get(j); |
|
|
|
|
tabLayout.setBackupBound(tabLayout.getBounds()); |
|
|
|
|
int refSize = isHor ? tabLayout.getWidth() : tabLayout.getHeight(); |
|
|
|
|
double percent = (double) offset / refSize; |
|
|
|
|
//double percent = (double) offset / refSize;
|
|
|
|
|
double percent = offset / (double) (refSize - offset); |
|
|
|
|
if (percent < 0 && !tabLayout.canReduce(percent)) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
setAdjustedSize(tabLayout, offset, isHor); |
|
|
|
|
//setAdjustedSize(tabLayout, offset, isHor);
|
|
|
|
|
// for (int m = 0; m < tabLayout.getComponentCount(); m++) {
|
|
|
|
|
// XCreator childCreator = tabLayout.getXCreator(m);
|
|
|
|
|
// WAbsoluteLayout.BoundsWidget wgt = (WAbsoluteLayout.BoundsWidget) tabLayout.toData().getBoundsWidget(childCreator.toData());
|
|
|
|
|
// wgt.setBounds(tabLayout.getComponent(m).getBounds());
|
|
|
|
|
// }
|
|
|
|
|
for (int m = 0; m < tabLayout.getComponentCount(); m++) { |
|
|
|
|
XCreator childCreator = tabLayout.getXCreator(m); |
|
|
|
|
WAbsoluteLayout.BoundsWidget wgt = (WAbsoluteLayout.BoundsWidget) tabLayout.toData().getBoundsWidget(childCreator.toData()); |
|
|
|
|
wgt.setBounds(tabLayout.getComponent(m).getBounds()); |
|
|
|
|
wgt.setBounds(childCreator.getBackupBound()); |
|
|
|
|
wgt.setBackupBounds(childCreator.getBackupBound()); |
|
|
|
|
} |
|
|
|
|
adjustCreatorsSize(percent, tabLayout, isHor); |
|
|
|
|
} |
|
|
|
|