diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-28 17:39:11 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-28 17:41:49 -0700 |
| commit | 4c2abc241ea8c7816a3eac83a44d186f2b504f73 (patch) | |
| tree | 56d10f1324c05cb9c02a4c709bac9cc9eed2254e /src | |
| parent | fb2436ef2e5ba9b5c16c7f0fdc948fc6d1faf8b5 (diff) | |
| download | wix-4c2abc241ea8c7816a3eac83a44d186f2b504f73.tar.gz wix-4c2abc241ea8c7816a3eac83a44d186f2b504f73.tar.bz2 wix-4c2abc241ea8c7816a3eac83a44d186f2b504f73.zip | |
Support localized TextStyle Size
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core/Compiler_UI.cs | 5 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs index 1ecf4f64..36d2e4e9 100644 --- a/src/WixToolset.Core/Compiler_UI.cs +++ b/src/WixToolset.Core/Compiler_UI.cs | |||
| @@ -860,9 +860,10 @@ namespace WixToolset.Core | |||
| 860 | 860 | ||
| 861 | if (!this.Core.EncounteredError) | 861 | if (!this.Core.EncounteredError) |
| 862 | { | 862 | { |
| 863 | var symbol = this.Core.AddSymbol(new TextStyleSymbol(sourceLineNumbers, id) | 863 | this.Core.AddSymbol(new TextStyleSymbol(sourceLineNumbers, id) |
| 864 | { | 864 | { |
| 865 | FaceName = faceName, | 865 | FaceName = faceName, |
| 866 | LocalizedSize = size, | ||
| 866 | Red = red, | 867 | Red = red, |
| 867 | Green = green, | 868 | Green = green, |
| 868 | Blue = blue, | 869 | Blue = blue, |
| @@ -871,8 +872,6 @@ namespace WixToolset.Core | |||
| 871 | Strike = strike, | 872 | Strike = strike, |
| 872 | Underline = underline, | 873 | Underline = underline, |
| 873 | }); | 874 | }); |
| 874 | |||
| 875 | symbol.Set((int)TextStyleSymbolFields.Size, size); | ||
| 876 | } | 875 | } |
| 877 | } | 876 | } |
| 878 | 877 | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index 078a33d5..bbeb7bd4 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | |||
| @@ -904,7 +904,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 904 | } | 904 | } |
| 905 | } | 905 | } |
| 906 | 906 | ||
| 907 | [Fact(Skip = "Test demonstrates failure")] | 907 | [Fact] |
| 908 | public void PopulatesTextStyleTableWhenSizeIsLocalized() | 908 | public void PopulatesTextStyleTableWhenSizeIsLocalized() |
| 909 | { | 909 | { |
| 910 | var folder = TestData.Get(@"TestData"); | 910 | var folder = TestData.Get(@"TestData"); |