diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.SelectAction.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.SelectAction.png index 2faf6e4892..93ae91e571 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.SelectAction.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.SelectAction.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Size.Ratio.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Size.Ratio.png index 6eeab53874..5714734127 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Size.Ratio.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Size.Ratio.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Width.Ratio.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Width.Ratio.png index 19a771dc1e..e040163028 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Width.Ratio.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Width.Ratio.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Width.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Width.png index 8d12f030c0..378a0e34e5 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Width.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.Width.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.png index 752f0f518d..7f7d167108 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Column.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.ColumnSet.Spacing.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.ColumnSet.Spacing.png index 859e0339e9..ca43ec495d 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.ColumnSet.Spacing.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.ColumnSet.Spacing.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.ColumnSet.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.ColumnSet.png index cc363bf949..b8781c2ed3 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.ColumnSet.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.ColumnSet.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Container.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Container.png index 6e5c976680..93750a36e3 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Container.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Container.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Image.SelectAction.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Image.SelectAction.png index 61f2ac3b52..e1317a5e59 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Image.SelectAction.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Image.SelectAction.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Image.Style.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Image.Style.png index e0ffd2c928..5c93a65289 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Image.Style.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.0.Elements.Image.Style.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Elements.Media.Sources.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Elements.Media.Sources.png index 3ebff48d64..4b5fc2c2ef 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Elements.Media.Sources.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Elements.Media.Sources.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.ColumnSet.Media.VerticalStretch.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.ColumnSet.Media.VerticalStretch.png index 54264ff2c2..e1a0e87bfe 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.ColumnSet.Media.VerticalStretch.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.ColumnSet.Media.VerticalStretch.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.MediaAudioInColumnSet.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.MediaAudioInColumnSet.png index 9746330a85..4634da73fa 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.MediaAudioInColumnSet.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.MediaAudioInColumnSet.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.MediaInColumnSet.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.MediaInColumnSet.png index 9ebd96c850..7c7fc8e3cf 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.MediaInColumnSet.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.1.Tests.MediaInColumnSet.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.Column.MinHeight.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.Column.MinHeight.png index a76f124bec..4e5671e67f 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.Column.MinHeight.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.Column.MinHeight.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.Bleed.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.Bleed.png index 7ec9c82fb7..3cf05e7af7 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.Bleed.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.Bleed.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.MinHeight.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.MinHeight.png index fbf7028b48..1e64a6e86c 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.MinHeight.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.MinHeight.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.Style.png b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.Style.png index 5f90e7fa02..26e266d449 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.Style.png and b/source/uwp/AdaptiveCardTestApp/Expected/Fixed Size Non-Interactive.v1.2.Elements.ColumnSet.Style.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.SelectAction.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.SelectAction.png index 7ae56c128f..1b3eb9b040 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.SelectAction.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.SelectAction.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Size.Ratio.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Size.Ratio.png index 27a8cb23e0..b89a6cda55 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Size.Ratio.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Size.Ratio.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Width.Ratio.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Width.Ratio.png index d4262fbdd0..b89a6cda55 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Width.Ratio.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Width.Ratio.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Width.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Width.png index 293db3a404..63182f74bb 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Width.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.Width.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.png index 30a236837b..43b87058da 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Column.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.ColumnSet.Spacing.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.ColumnSet.Spacing.png index 43c2b1688c..938b55d438 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.ColumnSet.Spacing.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.ColumnSet.Spacing.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.ColumnSet.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.ColumnSet.png index 902d1c2a3d..43b87058da 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.ColumnSet.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.ColumnSet.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Container.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Container.png index be31bbde62..1ac89e36bb 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Container.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Container.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Image.Style.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Image.Style.png index f9169f679f..b17d3d8625 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Image.Style.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Elements.Image.Style.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Scenarios.WeatherLarge.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Scenarios.WeatherLarge.png index 3a889731b6..9386d7a215 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Scenarios.WeatherLarge.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.0.Scenarios.WeatherLarge.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.Column.MinHeight.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.Column.MinHeight.png index 746a7e0582..7778505b26 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.Column.MinHeight.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.Column.MinHeight.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.ColumnSet.Bleed.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.ColumnSet.Bleed.png index 7518aabc47..099885d48e 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.ColumnSet.Bleed.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.ColumnSet.Bleed.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.ColumnSet.Style.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.ColumnSet.Style.png index 07489071d4..5c87b359af 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.ColumnSet.Style.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Elements.ColumnSet.Style.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.Element.Requires.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.Element.Requires.png index fc9a538eb5..54aaf2cbe2 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.Element.Requires.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.Element.Requires.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.HideFirstVisibleElementSeparator.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.HideFirstVisibleElementSeparator.png index bfd3e7c511..9836e3a55b 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.HideFirstVisibleElementSeparator.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.HideFirstVisibleElementSeparator.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.ToggleVisibility.AllElements.png b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.ToggleVisibility.AllElements.png index f5b135af47..4df7f7e916 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.ToggleVisibility.AllElements.png and b/source/uwp/AdaptiveCardTestApp/Expected/No host config (default values).v1.2.Tests.ToggleVisibility.AllElements.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.SelectAction.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.SelectAction.png index 2fa5b26233..30de2a50d6 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.SelectAction.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.SelectAction.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Size.Ratio.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Size.Ratio.png index 854d6550b6..9eaa4e76b5 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Size.Ratio.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Size.Ratio.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Width.Ratio.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Width.Ratio.png index c596241a02..7ad7bed3ef 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Width.Ratio.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Width.Ratio.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Width.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Width.png index 7a4914b65b..dcfa615c0a 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Width.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.Width.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.png index 16b0a99cce..8f16c0bfb1 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Column.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.ColumnSet.Spacing.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.ColumnSet.Spacing.png index d8124629bf..039bd7ed47 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.ColumnSet.Spacing.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.ColumnSet.Spacing.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.ColumnSet.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.ColumnSet.png index 290f0c8dd0..7b29489120 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.ColumnSet.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.ColumnSet.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Container.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Container.png index e46f41bac7..ed59bffeee 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Container.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Container.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Image.Style.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Image.Style.png index cfd1f7cdab..a147c0a501 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Image.Style.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Elements.Image.Style.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Scenarios.WeatherLarge.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Scenarios.WeatherLarge.png index 3882b37a7a..1e3245f880 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Scenarios.WeatherLarge.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.0.Scenarios.WeatherLarge.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.1.Elements.VerticalContentAlignment_ForcedColumn.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.1.Elements.VerticalContentAlignment_ForcedColumn.png index 396134bc30..52441b671e 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.1.Elements.VerticalContentAlignment_ForcedColumn.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.1.Elements.VerticalContentAlignment_ForcedColumn.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.1.Elements.VerticalContentAlignment_ForcedContainer.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.1.Elements.VerticalContentAlignment_ForcedContainer.png index 0256cc1cb4..e68d1951e7 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.1.Elements.VerticalContentAlignment_ForcedContainer.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.1.Elements.VerticalContentAlignment_ForcedContainer.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Elements.ColumnSet.Bleed.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Elements.ColumnSet.Bleed.png index 290cbd3d78..bb1f898ff4 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Elements.ColumnSet.Bleed.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Elements.ColumnSet.Bleed.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Elements.ColumnSet.Style.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Elements.ColumnSet.Style.png index 1d03ea13cc..83785c14f3 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Elements.ColumnSet.Style.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Elements.ColumnSet.Style.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.Element.Requires.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.Element.Requires.png index eb98d28cd6..17c0923017 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.Element.Requires.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.Element.Requires.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.HideFirstVisibleElementSeparator.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.HideFirstVisibleElementSeparator.png index f7a1d4df56..87d7addab0 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.HideFirstVisibleElementSeparator.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.HideFirstVisibleElementSeparator.png differ diff --git a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.ToggleVisibility.AllElements.png b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.ToggleVisibility.AllElements.png index 6f7e133b53..1973d1970d 100644 Binary files a/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.ToggleVisibility.AllElements.png and b/source/uwp/AdaptiveCardTestApp/Expected/testVariantHostConfig.v1.2.Tests.ToggleVisibility.AllElements.png differ diff --git a/source/uwp/Renderer/lib/ElementTagContent.cpp b/source/uwp/Renderer/lib/ElementTagContent.cpp index a2ff6569a4..baf0642135 100644 --- a/source/uwp/Renderer/lib/ElementTagContent.cpp +++ b/source/uwp/Renderer/lib/ElementTagContent.cpp @@ -13,12 +13,14 @@ namespace AdaptiveNamespace HRESULT ElementTagContent::RuntimeClassInitialize(_In_ IAdaptiveCardElement* cardElement, _In_ IPanel* parentPanel, _In_ IUIElement* separator, - _In_ IColumnDefinition* columnDefinition) + _In_ IColumnDefinition* columnDefinition, + _In_ boolean expectedVisibility) { m_columnDefinition = columnDefinition; m_parentPanel = parentPanel; m_separator = separator; m_cardElement = cardElement; + m_expectedVisibility = expectedVisibility; return S_OK; } @@ -41,4 +43,16 @@ namespace AdaptiveNamespace { return m_parentPanel.CopyTo(parentPanel); } + + HRESULT ElementTagContent::get_ExpectedVisibility(_Outptr_ boolean* expectedVisibility) + { + *expectedVisibility = m_expectedVisibility; + return S_OK; + } + + HRESULT ElementTagContent::set_ExpectedVisibility(boolean expectedVisibility) + { + m_expectedVisibility = expectedVisibility; + return S_OK; + } } diff --git a/source/uwp/Renderer/lib/ElementTagContent.h b/source/uwp/Renderer/lib/ElementTagContent.h index 1f44b40941..84776754be 100644 --- a/source/uwp/Renderer/lib/ElementTagContent.h +++ b/source/uwp/Renderer/lib/ElementTagContent.h @@ -12,6 +12,10 @@ namespace AdaptiveNamespace virtual HRESULT get_AdaptiveCardElement(_COM_Outptr_ ABI::AdaptiveNamespace::IAdaptiveCardElement * *cardElement) = 0; virtual HRESULT get_Separator(_COM_Outptr_ ABI::Windows::UI::Xaml::IUIElement * *separator) = 0; virtual HRESULT get_ParentPanel(_COM_Outptr_ ABI::Windows::UI::Xaml::Controls::IPanel * *parentPanel) = 0; + // Auto size images hide themselves while they haven't finished loading even when they are expected to be visible so the best way + // to track the intended visibility of the element and its separator is keeping this flag to avoid comparing against the rendered visibility + virtual HRESULT get_ExpectedVisibility(_Outptr_ boolean* expectedVisibility) = 0; + virtual HRESULT set_ExpectedVisibility(_In_ boolean expectedVisibility) = 0; }; class ElementTagContent @@ -21,17 +25,21 @@ namespace AdaptiveNamespace HRESULT RuntimeClassInitialize(_In_ ABI::AdaptiveNamespace::IAdaptiveCardElement* cardElement, _In_ ABI::Windows::UI::Xaml::Controls::IPanel* parentPanel, _In_ ABI::Windows::UI::Xaml::IUIElement* separator, - _In_ ABI::Windows::UI::Xaml::Controls::IColumnDefinition* columnDefinition); + _In_ ABI::Windows::UI::Xaml::Controls::IColumnDefinition* columnDefinition, + _In_ boolean expectedVisibility); virtual HRESULT get_ColumnDefinition(_COM_Outptr_ ABI::Windows::UI::Xaml::Controls::IColumnDefinition** columnDefinition) override; virtual HRESULT get_AdaptiveCardElement(_COM_Outptr_ ABI::AdaptiveNamespace::IAdaptiveCardElement** cardElement) override; virtual HRESULT get_Separator(_COM_Outptr_ ABI::Windows::UI::Xaml::IUIElement** separator) override; virtual HRESULT get_ParentPanel(_COM_Outptr_ ABI::Windows::UI::Xaml::Controls::IPanel** parentPanel) override; + virtual HRESULT get_ExpectedVisibility(_Outptr_ boolean* expectedVisibility) override; + virtual HRESULT set_ExpectedVisibility(_In_ boolean expectedVisibility) override; private: Microsoft::WRL::ComPtr m_cardElement; Microsoft::WRL::ComPtr m_columnDefinition; Microsoft::WRL::ComPtr m_separator; Microsoft::WRL::ComPtr m_parentPanel; + boolean m_expectedVisibility; }; } diff --git a/source/uwp/Renderer/lib/XamlBuilder.cpp b/source/uwp/Renderer/lib/XamlBuilder.cpp index 46f217f13b..9ae9e1d459 100644 --- a/source/uwp/Renderer/lib/XamlBuilder.cpp +++ b/source/uwp/Renderer/lib/XamlBuilder.cpp @@ -873,7 +873,7 @@ namespace AdaptiveNamespace } ComPtr tagContent; - RETURN_IF_FAILED(MakeAndInitialize(&tagContent, element, parentPanel, separator, columnDefinition)); + RETURN_IF_FAILED(MakeAndInitialize(&tagContent, element, parentPanel, separator, columnDefinition, isVisible)); RETURN_IF_FAILED(newControlAsFrameworkElement->put_Tag(tagContent.Get())); ABI::AdaptiveNamespace::HeightType heightType{}; @@ -973,11 +973,15 @@ namespace AdaptiveNamespace Visibility visibility; RETURN_IF_FAILED(child->get_Visibility(&visibility)); + boolean expectedVisibility{}; + RETURN_IF_FAILED(elementTagContent->get_ExpectedVisibility(&expectedVisibility)); + if (separator) { - if (visibility == Visibility_Collapsed || !foundPreviousVisibleElement) + if (!expectedVisibility || !foundPreviousVisibleElement) { // If the element is collapsed, or if it's the first visible element, collapse the separator + // Images are hidden while they are retrieved, we shouldn't hide the separator RETURN_IF_FAILED(separator->put_Visibility(Visibility_Collapsed)); } else @@ -1448,6 +1452,15 @@ namespace AdaptiveNamespace ComPtr toggleElementAsUIElement; RETURN_IF_FAILED(toggleElement.As(&toggleElementAsUIElement)); + ComPtr toggleElementAsFrameworkElement; + RETURN_IF_FAILED(toggleElement.As(&toggleElementAsFrameworkElement)); + + ComPtr tag; + RETURN_IF_FAILED(toggleElementAsFrameworkElement->get_Tag(&tag)); + + ComPtr elementTagContent; + RETURN_IF_FAILED(tag.As(&elementTagContent)); + Visibility visibilityToSet = Visibility_Visible; if (toggle == ABI::AdaptiveNamespace::IsVisible_IsVisibleTrue) { @@ -1459,21 +1472,13 @@ namespace AdaptiveNamespace } else if (toggle == ABI::AdaptiveNamespace::IsVisible_IsVisibleToggle) { - Visibility currentVisibility; - RETURN_IF_FAILED(toggleElementAsUIElement->get_Visibility(¤tVisibility)); - visibilityToSet = (currentVisibility == Visibility_Collapsed) ? Visibility_Visible : Visibility_Collapsed; + boolean currentVisibility{}; + RETURN_IF_FAILED(elementTagContent->get_ExpectedVisibility(¤tVisibility)); + visibilityToSet = (currentVisibility) ? Visibility_Collapsed : Visibility_Visible; } RETURN_IF_FAILED(toggleElementAsUIElement->put_Visibility(visibilityToSet)); - - ComPtr toggleElementAsFrameworkElement; - RETURN_IF_FAILED(toggleElement.As(&toggleElementAsFrameworkElement)); - - ComPtr tag; - RETURN_IF_FAILED(toggleElementAsFrameworkElement->get_Tag(&tag)); - - ComPtr elementTagContent; - RETURN_IF_FAILED(tag.As(&elementTagContent)); + RETURN_IF_FAILED(elementTagContent->set_ExpectedVisibility(visibilityToSet == Visibility_Visible)); ComPtr parentPanel; RETURN_IF_FAILED(elementTagContent->get_ParentPanel(&parentPanel));