8000 Merge pull request #1950 from NativeScript/decoration-transform-andro… · hbcodeXCI/NativeScript@3ca4e34 · GitHub
[go: up one dir, main page]

Skip to content

Commit 3ca4e34

Browse files
author
Vladimir Enchev
committed
Merge pull request NativeScript#1950 from NativeScript/decoration-transform-android-fix
text-transform and text-decoration fixed
2 parents 77ef136 + ed5903e commit 3ca4e34

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ui/button/button-common.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ var formattedTextProperty = new dependencyObservable.Property(
3535

3636
function onTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
3737
var button = <Button>data.object;
38+
39+
button._onTextPropertyChanged(data);
3840

3941
button.style._updateTextDecoration();
40-
button.style._updateTextTransform();
41-
42-
button._onTextPropertyChanged(data);
42+
button.style._updateTextTransform();
4343
}
4444

4545
function onFormattedTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {

ui/text-base/text-base-common.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ var formattedTextProperty = new dependencyObservable.Property(
2929
function onTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
3030
var textBase = <TextBase>data.object;
3131

32+
textBase._onTextPropertyChanged(data);
33+
3234
textBase.style._updateTextTransform();
3335
textBase.style._updateTextDecoration();
34-
35-
textBase._onTextPropertyChanged(data);
3636
}
3737

3838
(<proxy.PropertyMetadata>textProperty.metadata).onSetNativeValue = onTextPropertyChanged;

0 commit comments

Comments
 (0)
0