FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix: Button with text-decoration can't change text by hamorphis · Pull Request #2617 · NativeScript/NativeScript · GitHub

/ NativeScript Public

Fix: Button with text-decoration can't change text #2617

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
hamorphis merged 1 commit into from
Aug 23, 2016
Conversation 2 Commits 1 Checks 0 Files changed
Merged

Fix: Button with text-decoration can't change text #2617

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .ts  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
30 changes: 13 additions & 17 deletions tns-core-modules/ui/button/button.ios.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ export class Button extends common.Button {
// then the property defaults to a system value. Therefore, at a minimum, you should
// set the value for the normal state.
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) {
Expand Down Expand Up @@ -245,7 +251,7 @@ export class ButtonStyler implements style.Styler {
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);

if (button.formattedText) {
Expand Down Expand Up @@ -276,11 +282,7 @@ export class ButtonStyler implements style.Styler {
}
else {
let source = button.text;
let attributes = new Array();
let range = { location: 0, length: source.length };

let decorationValues = (decoration + "").split(" ");

let dict = new Map<string, number>();
if (decorationValues.indexOf(enums.TextDecoration.none) === -1 || hasLetterSpacing) {
if (decorationValues.indexOf(enums.TextDecoration.underline) !== -1) {
Expand All @@ -301,22 +303,16 @@ export class ButtonStyler implements style.Styler {
dict.set(NSForegroundColorAttributeName, buttonColor.ios);
}

if (dict.size > 0){
attributes.push({ attrs: dict, range: NSValue.valueWithRange(range) });
}

source = utils.ios.getTransformedText(button, source, transform);

let result = NSMutableAttributedString.alloc().initWithString(source);
if (attributes.length > 0) {
for (let i = 0; i < attributes.length; i++) {
result.setAttributesRange(attributes[i]["attrs"], attributes[i]["range"].rangeValue);
}

button.ios.setAttributedTitleForState(result, UIControlState.UIControlStateNormal);
if (dict.size > 0) {
result.setAttributesRange(<any>dict, NSValue.valueWithRange({ location: 0, length: source.length }).rangeValue);
}
else {
button.ios.setAttributedTitleForState(result, UIControlState.UIControlStateNormal);

button.ios.setAttributedTitleForState(result, UIControlState.UIControlStateNormal);

if (dict.size === 0) {
button.ios.setTitleForState(source, UIControlState.UIControlStateNormal);
}
}
Expand Down
Back | FazBrowse Home | New Git URL