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

text-transform and text-decoration with formattedText fixed

Browse Source
This commit is contained in:
Vladimir Enchev
2016-01-07 15:52:14 +02:00
parent e4b670a5c2
commit d7b13299b8
10 changed files with 157 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ui/button/button-common.ts
View File

@ -111,6 +111,7 @@ export class Button extends view.View implements definition.Button {
// then the property defaults to a system value. Therefore, at a minimum, you should
// set the value for the normal state.
this.ios.setAttributedTitleForState(value._formattedText, UIControlState.UIControlStateNormal);
this.style._updateTextDecoration();
}
}

8
ui/button/button.ios.ts
View File

@ -135,20 +135,20 @@ export class ButtonStyler implements style.Styler {
// text-decoration
private static setTextDecorationProperty(view: view.View, newValue: any) {
utils.ios.setTextDecoration((<UIButton>view.ios).titleLabel, newValue);
utils.ios.setTextDecorationAndTransform(view, newValue, view.style.textTransform);
}
private static resetTextDecorationProperty(view: view.View, nativeValue: any) {
utils.ios.setTextDecoration((<UIButton>view.ios).titleLabel, enums.TextDecoration.none);
utils.ios.setTextDecorationAndTransform(view, enums.TextDecoration.none, view.style.textTransform);
}
// text-transform
private static setTextTransformProperty(view: view.View, newValue: any) {
utils.ios.setTextTransform(view.ios, newValue);
utils.ios.setTextDecorationAndTransform(view, view.style.textDecoration, newValue);
}
private static resetTextTransformProperty(view: view.View, nativeValue: any) {
utils.ios.setTextTransform(view.ios, enums.TextTransform.none);
utils.ios.setTextDecorationAndTransform(view, view.style.textDecoration, enums.TextTransform.none);
}
// white-space

4
ui/text-base/text-base-styler.android.ts
View File

@ -94,11 +94,11 @@ export class TextBaseStyler implements style.Styler {
// text-transform
private static setTextTransformProperty(view: view.View, newValue: any) {
utils.ad.setTextTransform(view._nativeView, newValue);
utils.ad.setTextTransform(view, newValue);
}
private static resetTextTransformProperty(view: view.View, nativeValue: any) {
utils.ad.setTextTransform(view._nativeView, enums.TextTransform.none);
utils.ad.setTextTransform(view, enums.TextTransform.none);
}
// white-space

8
ui/text-base/text-base-styler.ios.ts
View File

@ -40,20 +40,20 @@ export class TextBaseStyler implements style.Styler {
// text-decoration
private static setTextDecorationProperty(view: view.View, newValue: any) {
utils.ios.setTextDecoration(view._nativeView, newValue);
utils.ios.setTextDecorationAndTransform(view, newValue, view.style.textTransform);
}
private static resetTextDecorationProperty(view: view.View, nativeValue: any) {
utils.ios.setTextDecoration(view._nativeView, enums.TextDecoration.none);
utils.ios.setTextDecorationAndTransform(view, enums.TextDecoration.none, view.style.textTransform);
}
// text-transform
private static setTextTransformProperty(view: view.View, newValue: any) {
utils.ios.setTextTransform(view._nativeView, newValue);
utils.ios.setTextDecorationAndTransform(view, view.style.textDecoration, newValue);
}
private static resetTextTransformProperty(view: view.View, nativeValue: any) {
utils.ios.setTextTransform(view._nativeView, enums.TextTransform.none);
utils.ios.setTextDecorationAndTransform(view, view.style.textDecoration, enums.TextTransform.none);
}
// white-space