Skip to content
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

Fix Innerloop Solution #3697

Merged
merged 7 commits into from
Nov 25, 2020
+2 −0
Merged

Fix Innerloop Solution #3697

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dadefd6
Add ImageIcon
StephenLPeters Nov 18, 2020
9aee5c7
Respond to feedback and use an svg image with an MIT license.
StephenLPeters Nov 20, 2020
1032e92
Merge remote-tracking branch 'origin/master' into user/stpete/ImageIcon
StephenLPeters Nov 20, 2020
43137ce
Fix broken test
StephenLPeters Nov 24, 2020
684d864
Platform check the IsLoaded check which was introduced in RS5
StephenLPeters Nov 24, 2020
ca3c6be
Merge remote-tracking branch 'origin/master' into user/stpete/ImageIcon
StephenLPeters Nov 25, 2020
f994a3b
Add preprocessor declaration around imageIconSource code in MakeIconE…
StephenLPeters Nov 25, 2020
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
2 changes: 2 additions & 0 deletions dev/dll/SharedHelpers.cpp
View file
Open in desktop
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