Merge pull request #1015 from NativeScript/Button-textWrap

Button textWrap implemented
This commit is contained in:
Vladimir Enchev
2015-11-02 11:41:04 +02:00
8 changed files with 71 additions and 1 deletions

View File

@@ -8,6 +8,10 @@ export function getNativeText(button: buttonModule.Button): string {
return button.android.getText();
}
export function getNativeTextWrap(button: buttonModule.Button): boolean {
return (<android.widget.Button>button.android).isSingleLine();
}
export function getNativeFontSize(button: buttonModule.Button): number {
var density = utilsModule.layout.getDisplayDensity();
return button.android.getTextSize() / density;

View File

@@ -2,7 +2,8 @@
import buttonModule = require("ui/button");
import colorModule = require("color");
export declare function getNativeText(button: buttonModule.Button) : string;
export declare function getNativeText(button: buttonModule.Button): string;
export declare function getNativeTextWrap(button: buttonModule.Button): boolean;
export declare function getNativeFontSize(button: buttonModule.Button): number;
export declare function getNativeColor(button: buttonModule.Button): colorModule.Color;
export declare function getNativeBackgroundColor(button: buttonModule.Button): colorModule.Color;

View File

@@ -7,6 +7,10 @@ export function getNativeText(button: buttonModule.Button): string {
return button.ios.titleForState(UIControlState.UIControlStateNormal);
}
export function getNativeTextWrap(button: buttonModule.Button): boolean {
return (<UIButton>button.ios).titleLabel.lineBreakMode === NSLineBreakMode.NSLineBreakByWordWrapping;
}
export function getNativeFontSize(button: buttonModule.Button): number {
return button.ios.titleLabel.font.pointSize;
}

View File

@@ -113,6 +113,21 @@ var _testSetText = function (views: Array<viewModule.View>) {
TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
}
var _testSetTextWrap = function (views: Array<viewModule.View>) {
var button = <buttonModule.Button>views[0];
// <snippet module="ui/button" title="button">
// ### Setting the text of a button
// ``` JavaScript
button.textWrap = true;
// ```
// </snippet>
var expectedValue = button.textWrap;
var actualValue = buttonTestsNative.getNativeTextWrap(button);
TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
}
var _testOnClick = function (views: Array<viewModule.View>) {
var button = <buttonModule.Button>views[0];