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

Inherit font properties form view inside spans

Browse Source
This commit is contained in:
vakrilov
2015-03-26 16:14:07 +02:00
parent 6841c66de8
commit 9eb66d8a46
6 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
text/span.ios.ts
View File

@@ -9,7 +9,10 @@ export class Span extends spanCommon.Span {
public updateSpanModifiers(parent: formattedString.FormattedString) {
super.updateSpanModifiers(parent);
var realFontFamily = this.fontFamily || (parent ? parent.fontFamily : undefined);
var realFontSize = this.fontSize || (parent ? parent.fontSize : undefined);
var realFontSize = this.fontSize ||
(parent ? parent.fontSize : undefined) ||
(parent && parent.parent ? parent.parent.style.fontSize : undefined);
var realFontAttributes = this.fontAttributes || (parent ? parent.fontAttributes : undefined);
if (realFontAttributes || realFontFamily || realFontSize) {
var font;
@@ -37,20 +40,27 @@ export class Span extends spanCommon.Span {
});
}
}
var realForegroundColor = this.foregroundColor || (parent ? parent.foregroundColor : undefined);
var realForegroundColor = this.foregroundColor ||
(parent ? parent.foregroundColor : undefined) ||
(parent && parent.parent ? parent.parent.style.color : undefined);
if (realForegroundColor) {
this.spanModifiers.push({
key: NSForegroundColorAttributeName,
value: realForegroundColor.ios
});
}
var realBackgroundColor = this.backgroundColor || (parent ? parent.backgroundColor : undefined);
var realBackgroundColor = this.backgroundColor ||
(parent ? parent.backgroundColor : undefined) ||
(parent && parent.parent ? parent.parent.style.backgroundColor : undefined);
if (realBackgroundColor) {
this.spanModifiers.push({
key: NSBackgroundColorAttributeName,
value: realBackgroundColor.ios
});
}
var realUnderline = this.underline || (parent ? parent.underline : undefined);
if (realUnderline) {
this.spanModifiers.push({