javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3454 from NativeScript/z-index

Browse Source 
Fix zIndex for Android buttons
This commit is contained in:
Rossen Hristov
2017-01-10 10:14:06 +02:00
committed by GitHub
parent cfbd548c1d fcda6454cc
commit f6b305fcb2
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tns-core-modules/ui/button/button.android.ts
View File

@ -1,7 +1,7 @@
import {
ButtonBase, TouchGestureEventData, GestureTypes, TouchAction,
PseudoClassHandler,
paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, Length
paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, Length, zIndexProperty
} from "./button-common";
export * from "./button-common";
@ -25,7 +25,7 @@ export class Button extends ButtonBase {
_button: android.widget.Button;
private _highlightedHandler: (args: TouchGestureEventData) => void;
private _defaultNativePadding: android.graphics.Rect;
get android(): android.widget.Button {
return this._button;
}
@ -96,4 +96,15 @@ export class Button extends ButtonBase {
set [paddingLeftProperty.native](value: Length) {
org.nativescript.widgets.ViewHelper.setPaddingLeft(this.nativeView, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderLeftWidth, 0));
}
get [zIndexProperty.native](): number {
return org.nativescript.widgets.ViewHelper.getZIndex(this.nativeView);
}
set [zIndexProperty.native](value: number) {
org.nativescript.widgets.ViewHelper.setZIndex(this.nativeView, value);
// API >= 21
if (this.nativeView.setStateListAnimator){
this.nativeView.setStateListAnimator(null);
}
}
}

2
tns-core-modules/ui/core/view-common.ts
View File

@ -1914,7 +1914,7 @@ function isFloatValueConverter(value: string): number {
return newValue;
}
export const zIndexProperty = new CssProperty<Style, number>({ name: "zIndex", cssName: "z-index", defaultValue: 0, valueConverter: isFloatValueConverter });
export const zIndexProperty = new CssProperty<Style, number>({ name: "zIndex", cssName: "z-index", defaultValue: Number.NaN, valueConverter: isFloatValueConverter });
zIndexProperty.register(Style);
function opacityConverter(value: any): number {