Skip to content

Use InvariantCulture when rendering colors and line-height #3657

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
Matt Hidinger (matthidinger) merged 2 commits into from
Dec 5, 2019
Merged

Use InvariantCulture when rendering colors and line-height #3657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeaa1b4
Makes sure to use InvariantCulture when rendering colors and line-hei…
mikoskinen Dec 3, 2019
7305455
Merge branch 'master' into master
matthidinger Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/dotnet/Library/AdaptiveCards.Rendering.Html/AdaptiveCardRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ protected static HtmlTag TextBlockRender(AdaptiveTextBlock textBlock, AdaptiveRe
.Style("box-sizing", "border-box")
.Style("text-align", textBlock.HorizontalAlignment.ToString().ToLower())
.Style("color", context.GetColor(textBlock.Color, textBlock.IsSubtle, false))
.Style("line-height", $"{lineHeight.ToString("F")}px")
.Style("line-height", $"{lineHeight.ToString("F", System.Globalization.CultureInfo.InvariantCulture)}px")
.Style("font-size", $"{fontSize}px")
.Style("font-weight", $"{weight}");

Expand Down Expand Up @@ -1065,7 +1065,7 @@ protected static HtmlTag TextRunRender(AdaptiveTextRun textRun, AdaptiveRenderCo
var uiTextRun = new HtmlTag("span", true)
.AddClass($"ac-{textRun.Type.Replace(".", "").ToLower()}")
.Style("color", context.GetColor(textRun.Color, textRun.IsSubtle, false))
.Style("line-height", $"{lineHeight.ToString("F")}px")
.Style("line-height", $"{lineHeight.ToString("F", System.Globalization.CultureInfo.InvariantCulture)}px")
.Style("font-size", $"{fontSize}px")
.Style("font-weight", $"{weight}");

Expand Down
2 changes: 1 addition & 1 deletion source/dotnet/Library/AdaptiveCards.Rendering.Html/AdaptiveRenderContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public string GetRGBColor(string color)
if (color.Length == 9)
{
var opacity = (float)Convert.ToByte(color.Substring(1, 2), 16) / Byte.MaxValue;
return $"rgba({Convert.ToByte(color.Substring(3, 2), 16)}, {Convert.ToByte(color.Substring(5, 2), 16)}, {Convert.ToByte(color.Substring(7, 2), 16)}, {opacity.ToString("F")})";
return $"rgba({Convert.ToByte(color.Substring(3, 2), 16)}, {Convert.ToByte(color.Substring(5, 2), 16)}, {Convert.ToByte(color.Substring(7, 2), 16)}, {opacity.ToString("F", System.Globalization.CultureInfo.InvariantCulture)})";
}
}
return color;
Expand Down