Skip to content

Commit

Permalink
Fix Innerloop Solution (#3697)
Browse files Browse the repository at this point in the history
* Add ImageIcon

* Respond to feedback and use an svg image with an MIT license.

* Fix broken test

* Platform check the IsLoaded check which was introduced in RS5

* Add preprocessor declaration around imageIconSource code in MakeIconElementFrom
  • Loading branch information
StephenLPeters authored Nov 25, 2020
1 parent 513ed82 commit 06b3e1d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions dev/dll/SharedHelpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ winrt::IconElement SharedHelpers::MakeIconElementFrom(winrt::IconSource const& i
}
return bitmapIcon;
}
#ifdef IMAGEICON_INCLUDED
else if (auto imageIconSource = iconSource.try_as<winrt::ImageIconSource>())
{
winrt::ImageIcon imageIcon;
Expand All @@ -578,6 +579,7 @@ winrt::IconElement SharedHelpers::MakeIconElementFrom(winrt::IconSource const& i
}
return imageIcon;
}
#endif
else if (auto pathIconSource = iconSource.try_as<winrt::PathIconSource>())
{
winrt::PathIcon pathIcon;
Expand Down

0 comments on commit 06b3e1d

Please sign in to comment.