mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 09:46:54 +02:00
CmdPal: Remove workaround for FontIconSource.CreateIconElement (#45790)
## Summary of the Pull Request This PR removes workaround for FontIconSource.CreateIconElement icon not being visible, as it looks like it was fixed in WASDK 1.8.4. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #45788 <!-- - [ ] Closes: #yyy (add separate lines for additional resolved issues) --> - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed
This commit is contained in:
@@ -182,25 +182,14 @@ public partial class IconBox : ContentControl
|
|||||||
break;
|
break;
|
||||||
case FontIconSource fontIcon:
|
case FontIconSource fontIcon:
|
||||||
self.UpdateLastFontSize();
|
self.UpdateLastFontSize();
|
||||||
|
fontIcon.FontSize = self._lastFontSize;
|
||||||
if (self.Content is IconSourceElement iconSourceElement)
|
if (self.Content is IconSourceElement iconSourceElement)
|
||||||
{
|
{
|
||||||
fontIcon.FontSize = self._lastFontSize;
|
|
||||||
iconSourceElement.IconSource = fontIcon;
|
iconSourceElement.IconSource = fontIcon;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fontIcon.FontSize = self._lastFontSize;
|
self.Content = fontIcon.CreateIconElement();
|
||||||
|
|
||||||
// For inexplicable reasons, FontIconSource.CreateIconElement
|
|
||||||
// doesn't work, so do it ourselves
|
|
||||||
// TODO: File platform bug?
|
|
||||||
IconSourceElement elem = new()
|
|
||||||
{
|
|
||||||
HorizontalAlignment = HorizontalAlignment.Center,
|
|
||||||
VerticalAlignment = VerticalAlignment.Center,
|
|
||||||
IconSource = fontIcon,
|
|
||||||
};
|
|
||||||
self.Content = elem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.UpdatePaddingForFontIcon();
|
self.UpdatePaddingForFontIcon();
|
||||||
|
|||||||
Reference in New Issue
Block a user