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

Padding for various iOS controls was not reflected the px/dip change

Browse Source
This commit is contained in:
Panayot Cankov
2017-03-13 10:49:58 +02:00
parent 6a0f12b677
commit 7e02f6ac73
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tns-core-modules/ui/button/button.ios.ts
View File

@@ -2,7 +2,7 @@
import {
ButtonBase, PseudoClassHandler, whiteSpaceProperty,
borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, textAlignmentProperty,
paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty, Length, WhiteSpace, TextAlignment
paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty, Length, WhiteSpace, TextAlignment, layout
} from "./button-common";
export * from "./button-common";
@@ -73,7 +73,7 @@ export class Button extends ButtonBase {
}
set [borderTopWidthProperty.native](value: Length) {
let inset = this.nativeView.contentEdgeInsets;
let top = this.effectivePaddingTop + this.effectiveBorderTopWidth;
let top = layout.toDeviceIndependentPixels(this.effectivePaddingTop + this.effectiveBorderTopWidth);
this.nativeView.contentEdgeInsets = { top: top, left: inset.left, bottom: inset.bottom, right: inset.right };
}
@@ -85,7 +85,7 @@ export class Button extends ButtonBase {
}
set [borderRightWidthProperty.native](value: Length) {
let inset = this.nativeView.contentEdgeInsets;
let right = this.effectivePaddingRight + this.effectiveBorderRightWidth;
let right = layout.toDeviceIndependentPixels(this.effectivePaddingRight + this.effectiveBorderRightWidth);
this.nativeView.contentEdgeInsets = { top: inset.top, left: inset.left, bottom: inset.bottom, right: right };
}
@@ -97,7 +97,7 @@ export class Button extends ButtonBase {
}
set [borderBottomWidthProperty.native](value: Length) {
let inset = this.nativeView.contentEdgeInsets;
let bottom = this.effectivePaddingBottom + this.effectiveBorderBottomWidth;
let bottom = layout.toDeviceIndependentPixels(this.effectivePaddingBottom + this.effectiveBorderBottomWidth);
this.nativeView.contentEdgeInsets = { top: inset.top, left: inset.left, bottom: bottom, right: inset.right };
}
@@ -109,7 +109,7 @@ export class Button extends ButtonBase {
}
set [borderLeftWidthProperty.native](value: Length) {
let inset = this.nativeView.contentEdgeInsets;
let left = this.effectivePaddingLeft + this.effectiveBorderLeftWidth;
let left = layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth);
this.nativeView.contentEdgeInsets = { top: inset.top, left: left, bottom: inset.bottom, right: inset.right };
}
@@ -121,7 +121,7 @@ export class Button extends ButtonBase {
}
set [paddingTopProperty.native](value: Length) {
let inset = this.nativeView.contentEdgeInsets;
let top = this.effectivePaddingTop + this.effectiveBorderTopWidth;
let top = layout.toDeviceIndependentPixels(this.effectivePaddingTop + this.effectiveBorderTopWidth);
this.nativeView.contentEdgeInsets = { top: top, left: inset.left, bottom: inset.bottom, right: inset.right };
}
@@ -133,7 +133,7 @@ export class Button extends ButtonBase {
}
set [paddingRightProperty.native](value: Length) {
let inset = this.nativeView.contentEdgeInsets;
let right = this.effectivePaddingRight + this.effectiveBorderRightWidth;
let right = layout.toDeviceIndependentPixels(this.effectivePaddingRight + this.effectiveBorderRightWidth);
this.nativeView.contentEdgeInsets = { top: inset.top, left: inset.left, bottom: inset.bottom, right: right };
}
@@ -145,7 +145,7 @@ export class Button extends ButtonBase {
}
set [paddingBottomProperty.native](value: Length) {
let inset = this.nativeView.contentEdgeInsets;
let bottom = this.effectivePaddingBottom + this.effectiveBorderBottomWidth;
let bottom = layout.toDeviceIndependentPixels(this.effectivePaddingBottom + this.effectiveBorderBottomWidth);
this.nativeView.contentEdgeInsets = { top: inset.top, left: inset.left, bottom: bottom, right: inset.right };
}
@@ -157,7 +157,7 @@ export class Button extends ButtonBase {
}
set [paddingLeftProperty.native](value: Length) {
let inset = this.nativeView.contentEdgeInsets;
let left = this.effectivePaddingLeft + this.effectiveBorderLeftWidth;
let left = layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth);
this.nativeView.contentEdgeInsets = { top: inset.top, left: left, bottom: inset.bottom, right: inset.right };
}