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

Set percent should use float instead of int values, setting height or width should reset theightPercent and widthPercent

Browse Source
This commit is contained in:
Panayot Cankov
2016-12-29 11:49:30 +02:00
committed by vakrilov
parent e443f1cf4e
commit cbc2497a53
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android/widgets/src/main/java/org/nativescript/widgets/ViewHelper.java
View File

@@ -49,11 +49,14 @@ public class ViewHelper {
} }
params.width = value; params.width = value;
if (params instanceof CommonLayoutParams) {
((CommonLayoutParams)params).widthPercent = -1;
}
view.setLayoutParams(params); view.setLayoutParams(params);
} }
public static void setWidthPercent(android.view.View view, int value) { public static void setWidthPercent(android.view.View view, float value) {
ViewGroup.LayoutParams params = view.getLayoutParams(); ViewGroup.LayoutParams params = view.getLayoutParams();
if (params == null) { if (params == null) {
CommonLayoutParams lp = new CommonLayoutParams(); CommonLayoutParams lp = new CommonLayoutParams();
@@ -83,11 +86,14 @@ public class ViewHelper {
} }
params.height = value; params.height = value;
if (params instanceof CommonLayoutParams) {
((CommonLayoutParams)params).heightPercent = -1;
}
view.setLayoutParams(params); view.setLayoutParams(params);
} }
public static void setHeightPercent(android.view.View view, int value) { public static void setHeightPercent(android.view.View view, float value) {
ViewGroup.LayoutParams params = view.getLayoutParams(); ViewGroup.LayoutParams params = view.getLayoutParams();
if (params == null) { if (params == null) {
CommonLayoutParams lp = new CommonLayoutParams(); CommonLayoutParams lp = new CommonLayoutParams();
@@ -160,7 +166,7 @@ public class ViewHelper {
} }
} }
public static void setMarginLeftPercent(android.view.View view, int value) { public static void setMarginLeftPercent(android.view.View view, float value) {
ViewGroup.LayoutParams params = view.getLayoutParams(); ViewGroup.LayoutParams params = view.getLayoutParams();
if (params == null) { if (params == null) {
CommonLayoutParams lp = new CommonLayoutParams(); CommonLayoutParams lp = new CommonLayoutParams();
@@ -205,7 +211,7 @@ public class ViewHelper {
} }
} }
public static void setMarginTopPercent(android.view.View view, int value) { public static void setMarginTopPercent(android.view.View view, float value) {
ViewGroup.LayoutParams params = view.getLayoutParams(); ViewGroup.LayoutParams params = view.getLayoutParams();
if (params == null) { if (params == null) {
CommonLayoutParams lp = new CommonLayoutParams(); CommonLayoutParams lp = new CommonLayoutParams();
@@ -250,7 +256,7 @@ public class ViewHelper {
} }
} }
public static void setMarginRightPercent(android.view.View view, int value) { public static void setMarginRightPercent(android.view.View view, float value) {
ViewGroup.LayoutParams params = view.getLayoutParams(); ViewGroup.LayoutParams params = view.getLayoutParams();
if (params == null) { if (params == null) {
CommonLayoutParams lp = new CommonLayoutParams(); CommonLayoutParams lp = new CommonLayoutParams();
@@ -295,7 +301,7 @@ public class ViewHelper {
} }
} }
public static void setMarginBottomPercent(android.view.View view, int value) { public static void setMarginBottomPercent(android.view.View view, float value) {
ViewGroup.LayoutParams params = view.getLayoutParams(); ViewGroup.LayoutParams params = view.getLayoutParams();
if (params == null) { if (params == null) {
CommonLayoutParams lp = new CommonLayoutParams(); CommonLayoutParams lp = new CommonLayoutParams();