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

Merge pull request #2617 from NativeScript/issue-2615

Browse Source 
Fix: Button with text-decoration can't change text
This commit is contained in:
Rossen Hristov
2016-08-23 15:40:48 +03:00
committed by GitHub
parent 7190276e90 33f5c901a8
commit fd552d4e84
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,12 @@ export class Button extends common.Button {
// then the property defaults to a system value. Therefore, at a minimum, you should // then the property defaults to a system value. Therefore, at a minimum, you should
// set the value for the normal state. // set the value for the normal state.
this.ios.setTitleForState(data.newValue + "", UIControlState.UIControlStateNormal); this.ios.setTitleForState(data.newValue + "", UIControlState.UIControlStateNormal);
//https://github.com/NativeScript/NativeScript/issues/2615
let attributedTitle = this.ios.attributedTitleForState(UIControlState.UIControlStateNormal);
if (attributedTitle !== null){
ButtonStyler._setButtonTextDecorationAndTransform(this, this.style.textDecoration, this.style.textTransform, this.style.letterSpacing);
}
} }
public _setFormattedTextPropertyToNative(value) { public _setFormattedTextPropertyToNative(value) {
@ -245,7 +251,7 @@ export class ButtonStyler implements style.Styler {
ButtonStyler.resetWhiteSpaceProperty), "Button"); ButtonStyler.resetWhiteSpaceProperty), "Button");
} }
private static _setButtonTextDecorationAndTransform(button: Button, decoration: string, transform: string, letterSpacing: number) { public static _setButtonTextDecorationAndTransform(button: Button, decoration: string, transform: string, letterSpacing: number) {
let hasLetterSpacing = types.isNumber(letterSpacing) && !isNaN(letterSpacing); let hasLetterSpacing = types.isNumber(letterSpacing) && !isNaN(letterSpacing);
if (button.formattedText) { if (button.formattedText) {
@ -276,11 +282,7 @@ export class ButtonStyler implements style.Styler {
} }
else { else {
let source = button.text; let source = button.text;
let attributes = new Array();
let range = { location: 0, length: source.length };
let decorationValues = (decoration + "").split(" "); let decorationValues = (decoration + "").split(" ");
let dict = new Map<string, number>(); let dict = new Map<string, number>();
if (decorationValues.indexOf(enums.TextDecoration.none) === -1 || hasLetterSpacing) { if (decorationValues.indexOf(enums.TextDecoration.none) === -1 || hasLetterSpacing) {
if (decorationValues.indexOf(enums.TextDecoration.underline) !== -1) { if (decorationValues.indexOf(enums.TextDecoration.underline) !== -1) {
@ -301,22 +303,16 @@ export class ButtonStyler implements style.Styler {
dict.set(NSForegroundColorAttributeName, buttonColor.ios); dict.set(NSForegroundColorAttributeName, buttonColor.ios);
} }
if (dict.size > 0){
attributes.push({ attrs: dict, range: NSValue.valueWithRange(range) });
}
source = utils.ios.getTransformedText(button, source, transform); source = utils.ios.getTransformedText(button, source, transform);
let result = NSMutableAttributedString.alloc().initWithString(source); let result = NSMutableAttributedString.alloc().initWithString(source);
if (attributes.length > 0) { if (dict.size > 0) {
for (let i = 0; i < attributes.length; i++) { result.setAttributesRange(<any>dict, NSValue.valueWithRange({ location: 0, length: source.length }).rangeValue);
result.setAttributesRange(attributes[i]["attrs"], attributes[i]["range"].rangeValue);
}
button.ios.setAttributedTitleForState(result, UIControlState.UIControlStateNormal);
} }
else {
button.ios.setAttributedTitleForState(result, UIControlState.UIControlStateNormal); button.ios.setAttributedTitleForState(result, UIControlState.UIControlStateNormal);
if (dict.size === 0) {
button.ios.setTitleForState(source, UIControlState.UIControlStateNormal); button.ios.setTitleForState(source, UIControlState.UIControlStateNormal);
} }
} }