javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 02:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7276 from NativeScript/mdonev/release-to-master7271

Browse Source 
chore: merge release to master
This commit is contained in:
Manol Donev
2019-05-22 18:07:07 +03:00
committed by GitHub
parent 2e15dd66d9 3b230675d8
commit a345a14a8b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java
View File

@ -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. // 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") @SuppressLint("RtlHardcoded")
protected static void layoutChild(View child, int left, int top, int right, int bottom) { 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; return;
} }
@ -223,7 +223,7 @@ public class CommonLayoutParams extends FrameLayout.LayoutParams {
} }
protected static void measureChild(View child, int widthMeasureSpec, int heightMeasureSpec) { protected static void measureChild(View child, int widthMeasureSpec, int heightMeasureSpec) {
if (child.getVisibility() == View.GONE) { if (child == null || child.getVisibility() == View.GONE) {
return; return;
} }