Skip to content

Commit 1981284

Browse files
anna-dingleranna-dingler
authored
[UWP Renderer] Parse for SVG width and height (#8256)
* WIP: set raster height and width * WIP: add template method * WIP: parse svg for size * Update resources and spacing * update visualizer csproj * Only set height * Resolve PR comments * Remove try catch blocks * [UWP] Remove weak_ref from method headers and pass by value (#8295) * Temp branch * svg updates * Pass by value * Remove temp var * Use make_weak * Fix spacing * Resolve PR comments * Use image properties struct * Resolve PR comments and handle errors * Add test json
1 parent 4b06f1d commit 1981284

File tree

7 files changed

+471
-137
lines changed

7 files changed

+471
-137
lines changed

‎samples/v1.5/Tests/Image.Svg.json‎

Lines changed: 65 additions & 0 deletions
Large diffs are not rendered by default.

‎source/uwp/Renderer/lib/AdaptiveImageRenderer.cpp‎

Lines changed: 317 additions & 122 deletions
Large diffs are not rendered by default.

‎source/uwp/Renderer/lib/Util.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,19 @@ std::string HStringToUTF8(winrt::hstring const& in)
9292
return WStringToString(in);
9393
}
9494

95+
std::optional<double> TryHStringToDouble(winrt::hstring const& in)
96+
{
97+
try
98+
{
99+
return std::stod(winrt::to_string(in));
100+
}
101+
catch (std::invalid_argument)
102+
{
103+
// in was not a valid double
104+
return {};
105+
}
106+
}
107+
95108
// Get a Color object from color string
96109
// Expected formats are "#AARRGGBB" (with alpha channel) and "#RRGGBB" (without alpha channel)
97110
winrt::Windows::UI::Color GetColorFromString(const std::string& colorString)

‎source/uwp/Renderer/lib/Util.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ template<typename TStored> struct property_opt
9595
std::string WStringToString(std::wstring_view in);
9696
std::wstring StringToWString(std::string_view in);
9797

98+
std::optional<double> TryHStringToDouble(winrt::hstring const& in);
99+
98100
// This function is needed to deal with the fact that non-windows platforms handle Unicode without the need for wchar_t.
99101
// (which has a platform specific implementation) It converts a std::string to an HSTRING.
100102
winrt::hstring UTF8ToHString(std::string_view in);

‎source/uwp/Renderer/lib/XamlBuilder.h‎

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,18 @@ namespace AdaptiveCards::Rendering::Uwp
1313
public:
1414
XamlBuilder();
1515

16+
template<typename TElement>
17+
struct ImageProperties
18+
{
19+
TElement uiElement;
20+
bool isAutoSize;
21+
winrt::IInspectable parentElement;
22+
winrt::IInspectable imageContainer;
23+
bool isVisible;
24+
boolean isImageSvg;
25+
winrt::Stretch stretch = winrt::Stretch::UniformToFill;
26+
};
27+
1628
// IImageLoadTrackerListener
1729
void AllImagesLoaded() override;
1830
void ImagesLoadingHadError() override;
@@ -54,34 +66,56 @@ namespace AdaptiveCards::Rendering::Uwp
5466
winrt::AdaptiveRenderArgs const& renderArgs,
5567
XamlBuilder* xamlBuilder);
5668

57-
template<typename T>
58-
void SetAutoSize(T const& destination,
69+
template<typename TDest>
70+
void SetAutoSize(TDest const& destination,
5971
winrt::IInspectable const& parentElement,
6072
winrt::IInspectable const& imageContainer,
6173
bool isVisible,
6274
bool imageFiresOpenEvent);
6375

64-
template<typename T>
65-
void SetImageSource(T const& destination, winrt::ImageSource const& imageSource, winrt::Stretch stretch = winrt::Stretch::UniformToFill);
76+
template<typename TDest>
77+
void SetImageSource(TDest const& destination, winrt::ImageSource const& imageSource, winrt::Stretch stretch = winrt::Stretch::UniformToFill);
6678

67-
template<typename T>
68-
void SetImageOnUIElement(winrt::Uri const& imageUrl,
69-
T const& uiElement,
70-
winrt::AdaptiveCardResourceResolvers const& resolvers,
71-
bool isAutoSize,
72-
winrt::IInspectable const& parentElement,
73-
winrt::IInspectable const& imageContainer,
74-
bool isVisible,
75-
bool isImageSvg = false,
76-
winrt::Stretch stretch = winrt::Stretch::UniformToFill);
79+
template<typename TElement>
80+
winrt::ImageSource SetImageOnUIElement(winrt::Uri const& imageUrl,
81+
winrt::AdaptiveCardResourceResolvers const& resolvers,
82+
ImageProperties<TElement> const& imgProperties);
7783

7884
winrt::ImageSource CreateImageSource(bool isImageSvg);
7985

80-
template<typename T> void PopulateImageFromUrlAsync(winrt::Uri const& imageUrl, T const& imageControl, bool const& isImageSvg);
86+
template<typename TElement>
87+
winrt::ImageSource PopulateImageFromUrlAsync(winrt::Uri const& imageUrl,
88+
ImageProperties<TElement> const& imgProperties);
89+
90+
template<typename TElement, typename TStream>
91+
void HandleAccessStreamForImageSource(ImageProperties<TElement> const& imgProperties,
92+
TStream const& stream,
93+
winrt::ImageSource const& imageSource);
94+
95+
winrt::fire_and_forget SetSvgUriSource(winrt::SvgImageSource const imageSourceRef,
96+
winrt::Uri const uriRef);
97+
98+
template<typename TElement, typename TStream>
99+
winrt::IAsyncAction SetSvgImageSourceAsync(winrt::SvgImageSource const imageSourceRef,
100+
TStream const streamRef,
101+
ImageProperties<TElement> const imgProperties);
81102

82103
boolean IsSvgImage(std::string url);
83104

84105
void FireAllImagesLoaded();
85106
void FireImagesLoadingHadError();
107+
108+
bool ParseXmlForHeightAndWidth(winrt::XmlDocument const& xmlDoc,
109+
winrt::SvgImageSource const& imageSourceRef);
110+
111+
winrt::fire_and_forget SetRasterizedPixelHeightAsync(winrt::SvgImageSource const imageSourceRef,
112+
double const imageSize,
113+
bool const dropIfUnset = false);
114+
winrt::fire_and_forget SetRasterizedPixelWidthAsync(winrt::SvgImageSource const imageSourceRef,
115+
double const imageSize,
116+
bool const dropIfUnset = false);
117+
118+
void SetRasterizedPixelHeight(winrt::ImageSource const& imageSource, double const& imageSize);
119+
void SetRasterizedPixelWidth(winrt::ImageSource const& imageSource, double const& imageSize);
86120
};
87121
}

‎source/uwp/Visualizer/AdaptiveCardVisualizer.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
<Content Include="Assets\StoreLogo.scale-200.png" />
106106
<Content Include="Assets\StoreLogo.scale-400.png" />
107107
<Content Include="Assets\Symbols\adaptive-card.svg" />
108+
<Content Include="Assets\Symbols\adaptive-card-fixed-height.svg" />
108109
<Content Include="Assets\Wide310x150Logo.scale-100.png" />
109110
<Content Include="Assets\Wide310x150Logo.scale-400.png" />
110111
<Content Include="HostConfigs\DefaultHostConfig.json" />

‎source/uwp/Visualizer/Assets/Symbols/adaptive-card-fixed-height.svg‎

Lines changed: 24 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)