fix when parent is fit ,child is most,resolve this situation
This commit is contained in:
@@ -16,9 +16,10 @@
|
||||
package pub.doric.shader;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.LinearLayout;
|
||||
|
||||
import pub.doric.DoricContext;
|
||||
import pub.doric.extension.bridge.DoricPlugin;
|
||||
@@ -27,6 +28,8 @@ import pub.doric.utils.DoricUtils;
|
||||
import com.github.pengfeizhou.jscore.JSObject;
|
||||
import com.github.pengfeizhou.jscore.JSValue;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* @Description: com.github.penfeizhou.doric.widget
|
||||
* @Author: pengfei.zhou
|
||||
@@ -37,15 +40,121 @@ public class StackNode extends GroupNode<FrameLayout> {
|
||||
private static class MaximumFrameLayout extends FrameLayout {
|
||||
private int maxWidth = Integer.MAX_VALUE;
|
||||
private int maxHeight = Integer.MAX_VALUE;
|
||||
|
||||
private final ArrayList<View> mMatchParentChildren = new ArrayList<>(1);
|
||||
|
||||
public MaximumFrameLayout(Context context) {
|
||||
super(context);
|
||||
}
|
||||
|
||||
int getPaddingLeftWithForeground() {
|
||||
return getPaddingLeft();
|
||||
}
|
||||
|
||||
int getPaddingRightWithForeground() {
|
||||
return getPaddingRight();
|
||||
}
|
||||
|
||||
private int getPaddingTopWithForeground() {
|
||||
return getPaddingTop();
|
||||
}
|
||||
|
||||
private int getPaddingBottomWithForeground() {
|
||||
return getPaddingBottom();
|
||||
}
|
||||
|
||||
private void rawOnMeasure(int widthMeasureSpec, int heightMeasureSpec) {
|
||||
int count = getChildCount();
|
||||
|
||||
final boolean measureMatchParentChildren =
|
||||
MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.EXACTLY ||
|
||||
MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.EXACTLY;
|
||||
mMatchParentChildren.clear();
|
||||
|
||||
int maxHeight = 0;
|
||||
int maxWidth = 0;
|
||||
int childState = 0;
|
||||
|
||||
for (int i = 0; i < count; i++) {
|
||||
final View child = getChildAt(i);
|
||||
if (getMeasureAllChildren() || child.getVisibility() != GONE) {
|
||||
measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0);
|
||||
final LayoutParams lp = (LayoutParams) child.getLayoutParams();
|
||||
maxWidth = Math.max(maxWidth,
|
||||
child.getMeasuredWidth() + lp.leftMargin + lp.rightMargin);
|
||||
maxHeight = Math.max(maxHeight,
|
||||
child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin);
|
||||
childState = combineMeasuredStates(childState, child.getMeasuredState());
|
||||
if (measureMatchParentChildren) {
|
||||
if (lp.width == LayoutParams.MATCH_PARENT ||
|
||||
lp.height == LayoutParams.MATCH_PARENT) {
|
||||
mMatchParentChildren.add(child);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Account for padding too
|
||||
maxWidth += getPaddingLeftWithForeground() + getPaddingRightWithForeground();
|
||||
maxHeight += getPaddingTopWithForeground() + getPaddingBottomWithForeground();
|
||||
|
||||
// Check against our minimum height and width
|
||||
maxHeight = Math.max(maxHeight, getSuggestedMinimumHeight());
|
||||
maxWidth = Math.max(maxWidth, getSuggestedMinimumWidth());
|
||||
|
||||
// Check against our foreground's minimum height and width
|
||||
final Drawable drawable = getForeground();
|
||||
if (drawable != null) {
|
||||
maxHeight = Math.max(maxHeight, drawable.getMinimumHeight());
|
||||
maxWidth = Math.max(maxWidth, drawable.getMinimumWidth());
|
||||
}
|
||||
|
||||
setMeasuredDimension(resolveSizeAndState(maxWidth, widthMeasureSpec, childState),
|
||||
resolveSizeAndState(maxHeight, heightMeasureSpec,
|
||||
childState << MEASURED_HEIGHT_STATE_SHIFT));
|
||||
|
||||
count = mMatchParentChildren.size();
|
||||
if (count > 0) {
|
||||
for (int i = 0; i < count; i++) {
|
||||
final View child = mMatchParentChildren.get(i);
|
||||
final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams();
|
||||
|
||||
final int childWidthMeasureSpec;
|
||||
if (lp.width == LayoutParams.MATCH_PARENT) {
|
||||
final int width = Math.max(0, getMeasuredWidth()
|
||||
- getPaddingLeftWithForeground() - getPaddingRightWithForeground()
|
||||
- lp.leftMargin - lp.rightMargin);
|
||||
childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(
|
||||
width, MeasureSpec.EXACTLY);
|
||||
} else {
|
||||
childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec,
|
||||
getPaddingLeftWithForeground() + getPaddingRightWithForeground() +
|
||||
lp.leftMargin + lp.rightMargin,
|
||||
lp.width);
|
||||
}
|
||||
|
||||
final int childHeightMeasureSpec;
|
||||
if (lp.height == LayoutParams.MATCH_PARENT) {
|
||||
final int height = Math.max(0, getMeasuredHeight()
|
||||
- getPaddingTopWithForeground() - getPaddingBottomWithForeground()
|
||||
- lp.topMargin - lp.bottomMargin);
|
||||
childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(
|
||||
height, MeasureSpec.EXACTLY);
|
||||
} else {
|
||||
childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec,
|
||||
getPaddingTopWithForeground() + getPaddingBottomWithForeground() +
|
||||
lp.topMargin + lp.bottomMargin,
|
||||
lp.height);
|
||||
}
|
||||
|
||||
child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
|
||||
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
|
||||
rawOnMeasure(widthMeasureSpec, heightMeasureSpec);
|
||||
int width = getMeasuredWidth();
|
||||
int height = getMeasuredHeight();
|
||||
if (width > maxWidth || height > maxHeight) {
|
||||
@@ -53,7 +162,7 @@ public class StackNode extends GroupNode<FrameLayout> {
|
||||
height = Math.min(height, maxHeight);
|
||||
widthMeasureSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST);
|
||||
heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST);
|
||||
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
|
||||
rawOnMeasure(widthMeasureSpec, heightMeasureSpec);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user