Skip to content

Fixed paddings #2552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hshristov merged 2 commits into from
Aug 7, 2016
Merged

Fixed paddings #2552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
906db83
Fixed paddings
Aug 5, 2016
022d21e
Fix tslint
Aug 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 89 additions & 27 deletions tns-core-modules/ui/core/view.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import * as types from "utils/types";
import style = require("ui/styling/style");
import enums = require("ui/enums");
import background = require("ui/styling/background");
import {CommonLayoutParams, Thickness} from "ui/styling/style";
import {CommonLayoutParams} from "ui/styling/style";
import {device} from "platform";

global.moduleMerge(viewCommon, exports);
Expand Down Expand Up @@ -254,6 +254,12 @@ export class View extends viewCommon.View {
}

// copy all the locally cached values to the native android widget
// Initialize padding default values.
// TODO: remove this code.
let padding = this.style.paddingLeft;
padding = this.style.paddingTop;
padding = this.style.paddingRight;
padding = this.style.paddingBottom;
this._syncNativeProperties();
trace.notifyEvent(this, "_onContextChanged");
}
Expand Down Expand Up @@ -650,23 +656,64 @@ export class ViewStyler implements style.Styler {
ViewStyler.setNativeLayoutParamsProperty(view, style.nativeLayoutParamsProperty.defaultValue)
}

private static setPaddingProperty(view: View, newValue: Thickness) {
private static getNativePaddingLeft(view: View): number {
let density = utils.layout.getDisplayDensity();
let style = view.style;
let left = Math.round((style.paddingLeft + view.borderWidth) * density);
let top = Math.round((style.paddingTop + view.borderWidth) * density);
let right = Math.round((style.paddingRight + view.borderWidth) * density);
let bottom = Math.round((style.paddingBottom + view.borderWidth) * density);
(<android.view.View>view._nativeView).setPadding(left, top, right, bottom);
return view._nativeView.getPaddingLeft() / density;
}

private static resetPaddingProperty(view: View, nativeValue: Thickness) {
var density = utils.layout.getDisplayDensity();
var left = Math.round((nativeValue.left + view.borderWidth) * density);
var top = Math.round((nativeValue.top + view.borderWidth) * density);
var right = Math.round((nativeValue.right + view.borderWidth) * density);
var bottom = Math.round((nativeValue.bottom + view.borderWidth) * density);
(<android.view.View>view._nativeView).setPadding(left, top, right, bottom);
private static getNativePaddingTop(view: View): number {
let density = utils.layout.getDisplayDensity();
return view._nativeView.getPaddingTop() / density;
}

private static getNativePaddingRight(view: View): number {
let density = utils.layout.getDisplayDensity();
return view._nativeView.getPaddingRight() / density;
}

private static getNativePaddingBottom(view: View): number {
let density = utils.layout.getDisplayDensity();
return view._nativeView.getPaddingBottom() / density;
}

private static setNativePaddingLeft(view: View, value: number): void {
let nativeView = view._nativeView;
let density = utils.layout.getDisplayDensity();
let left = (value + view.borderWidth) * density;
let top = nativeView.getPaddingTop();
let right = nativeView.getPaddingRight();
let bottom = nativeView.getPaddingBottom();
nativeView.setPadding(left, top, right, bottom);
}

private static setNativePaddingTop(view: View, value: number): void {
let nativeView = view._nativeView;
let density = utils.layout.getDisplayDensity();
let left = nativeView.getPaddingLeft();
let top = (value + view.borderWidth) * density;
let right = nativeView.getPaddingRight();
let bottom = nativeView.getPaddingBottom();
nativeView.setPadding(left, top, right, bottom);
}

private static setNativePaddingRight(view: View, value: number): void {
let nativeView = view._nativeView;
let density = utils.layout.getDisplayDensity();
let left = nativeView.getPaddingLeft();
let top = nativeView.getPaddingTop();
let right = (value + view.borderWidth) * density;
let bottom = nativeView.getPaddingBottom();
nativeView.setPadding(left, top, right, bottom);
}

private static setNativePaddingBottom(view: View, value: number): void {
let nativeView = view._nativeView;
let density = utils.layout.getDisplayDensity();
let left = nativeView.getPaddingLeft();
let top = nativeView.getPaddingTop();
let right = nativeView.getPaddingRight();
let bottom = (value + view.borderWidth) * density;
nativeView.setPadding(left, top, right, bottom);
}

// Rotate
Expand Down Expand Up @@ -764,17 +811,32 @@ export class ViewStyler implements style.Styler {
ViewStyler.setNativeLayoutParamsProperty,
ViewStyler.resetNativeLayoutParamsProperty));

style.registerHandler(style.nativePaddingsProperty, new style.StylePropertyChangedHandler(
ViewStyler.setPaddingProperty,
ViewStyler.resetPaddingProperty), "TextBase");

style.registerHandler(style.nativePaddingsProperty, new style.StylePropertyChangedHandler(
ViewStyler.setPaddingProperty,
ViewStyler.resetPaddingProperty), "Button");

style.registerHandler(style.nativePaddingsProperty, new style.StylePropertyChangedHandler(
ViewStyler.setPaddingProperty,
ViewStyler.resetPaddingProperty), "LayoutBase");
style.registerHandler(style.paddingLeftProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingLeft, ViewStyler.setNativePaddingLeft, ViewStyler.getNativePaddingLeft), "TextBase");
style.registerHandler(style.paddingTopProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingTop, ViewStyler.setNativePaddingTop, ViewStyler.getNativePaddingTop), "TextBase");
style.registerHandler(style.paddingRightProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingRight, ViewStyler.setNativePaddingRight, ViewStyler.getNativePaddingRight), "TextBase");
style.registerHandler(style.paddingBottomProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingBottom, ViewStyler.setNativePaddingBottom, ViewStyler.getNativePaddingBottom), "TextBase");

style.registerHandler(style.paddingLeftProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingLeft, ViewStyler.setNativePaddingLeft, ViewStyler.getNativePaddingLeft), "Button");
style.registerHandler(style.paddingTopProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingTop, ViewStyler.setNativePaddingTop, ViewStyler.getNativePaddingTop), "Button");
style.registerHandler(style.paddingRightProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingRight, ViewStyler.setNativePaddingRight, ViewStyler.getNativePaddingRight), "Button");
style.registerHandler(style.paddingBottomProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingBottom, ViewStyler.setNativePaddingBottom, ViewStyler.getNativePaddingBottom), "Button");

style.registerHandler(style.paddingLeftProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingLeft, ViewStyler.setNativePaddingLeft, ViewStyler.getNativePaddingLeft), "LayoutBase");
style.registerHandler(style.paddingTopProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingTop, ViewStyler.setNativePaddingTop, ViewStyler.getNativePaddingTop), "LayoutBase");
style.registerHandler(style.paddingRightProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingRight, ViewStyler.setNativePaddingRight, ViewStyler.getNativePaddingRight), "LayoutBase");
style.registerHandler(style.paddingBottomProperty,
new style.StylePropertyChangedHandler(ViewStyler.setNativePaddingBottom, ViewStyler.setNativePaddingBottom, ViewStyler.getNativePaddingBottom), "LayoutBase");

style.registerHandler(style.rotateProperty, new style.StylePropertyChangedHandler(
ViewStyler.setRotateProperty,
Expand All @@ -795,7 +857,7 @@ export class ViewStyler implements style.Styler {
style.registerHandler(style.translateYProperty, new style.StylePropertyChangedHandler(
ViewStyler.setTranslateYProperty,
ViewStyler.resetTranslateYProperty));

if (parseInt(device.sdkVersion, 10) >= 21) {
style.registerHandler(style.zIndexProperty, new style.StylePropertyChangedHandler(
ViewStyler.setZIndexProperty,
Expand Down
2 changes: 1 addition & 1 deletion tns-core-modules/ui/styling/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,7 @@ export var nativePaddingsProperty = new styleProperty.Property("paddingNative",
new PropertyMetadata(undefined, null, null, null, thicknessComparer));

// TODO: separate into .android/.ios files so that there is no need for such checks
var defaultPadding = platform.device.os === platform.platformNames.android ? undefined : 0;
var defaultPadding = platform.isAndroid ? undefined : 0;

export var paddingLeftProperty = new styleProperty.Property("paddingLeft", "padding-left",
new PropertyMetadata(defaultPadding, AffectsLayout, onPaddingValueChanged, isNonNegativeFiniteNumber), converters.numberConverter);
Expand Down