mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-14 18:12:09 +08:00
Merge pull request #7276 from NativeScript/mdonev/release-to-master7271
chore: merge release to master
This commit is contained in:
@ -99,7 +99,7 @@ public class CommonLayoutParams extends FrameLayout.LayoutParams {
|
||||
// We use our own layout method because the one in FrameLayout is broken when margins are set and gravity is CENTER_VERTICAL or CENTER_HORIZONTAL.
|
||||
@SuppressLint("RtlHardcoded")
|
||||
protected static void layoutChild(View child, int left, int top, int right, int bottom) {
|
||||
if (child.getVisibility() == View.GONE) {
|
||||
if (child == null || child.getVisibility() == View.GONE) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -223,7 +223,7 @@ public class CommonLayoutParams extends FrameLayout.LayoutParams {
|
||||
}
|
||||
|
||||
protected static void measureChild(View child, int widthMeasureSpec, int heightMeasureSpec) {
|
||||
if (child.getVisibility() == View.GONE) {
|
||||
if (child == null || child.getVisibility() == View.GONE) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user