Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-05-18 05:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

CmdPal: Extension Gallery - Move storyboards used to show/hide breadcrumbs to XAML (#47900)

Browse Source 
<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request

This PR moves storyboard that handles showing and hiding breadcrumbs in
Settings windows to a XAML resources.

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [ ] Closes: #xxx
<!-- - [ ] 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:
Jiří Polášek
2026-05-17 19:43:12 +02:00
committed by GitHub
parent e17454b553
commit 75ac1521a8
2 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
View File

@@ -23,6 +23,33 @@
<MicaBackdrop />
</winuiex:WindowEx.SystemBackdrop>
<Grid x:Name="RootElement">
<Grid.Resources>
<Storyboard x:Key="BreadcrumbFadeInStoryboard">
<DoubleAnimation
Storyboard.TargetName="BreadcrumbContainer"
Storyboard.TargetProperty="Opacity"
To="1"
Duration="0:0:0.25">
<DoubleAnimation.EasingFunction>
<CubicEase EasingMode="EaseOut" />
</DoubleAnimation.EasingFunction>
</DoubleAnimation>
</Storyboard>
<Storyboard x:Key="BreadcrumbFadeOutStoryboard">
<DoubleAnimation
Storyboard.TargetName="BreadcrumbContainer"
Storyboard.TargetProperty="Opacity"
To="0"
Duration="0:0:0.2">
<DoubleAnimation.EasingFunction>
<CubicEase EasingMode="EaseIn" />
</DoubleAnimation.EasingFunction>
</DoubleAnimation>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="BreadcrumbContainer" Storyboard.TargetProperty="Visibility">
<DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="Collapsed" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</Grid.Resources>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />

64
src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
View File

@@ -33,8 +33,9 @@ public sealed partial class SettingsWindow : WindowEx,
private readonly LocalKeyboardListener _localKeyboardListener;
private readonly NavigationViewItem? _internalNavItem;
private readonly Storyboard _breadcrumbFadeInStoryboard;
private readonly Storyboard _breadcrumbFadeOutStoryboard;
private Storyboard? _breadcrumbStoryboard;
private IReadOnlyList<ExtensionGalleryScreenshotViewModel> _currentScreenshotSet = [];
private ExtensionGalleryScreenshotViewModel? _currentScreenshot;
@@ -53,6 +54,8 @@ public sealed partial class SettingsWindow : WindowEx,
public SettingsWindow()
{
this.InitializeComponent();
_breadcrumbFadeInStoryboard = (Storyboard)RootElement.Resources["BreadcrumbFadeInStoryboard"];
_breadcrumbFadeOutStoryboard = (Storyboard)RootElement.Resources["BreadcrumbFadeOutStoryboard"];
this.ExtendsContentIntoTitleBar = true;
this.SetIcon();
var title = RS_.GetString("SettingsWindowTitle");
@@ -320,54 +323,30 @@ public sealed partial class SettingsWindow : WindowEx,
private void HideBreadcrumb()
{
_breadcrumbStoryboard?.Stop();
var fadeOut = new DoubleAnimation
if (BreadcrumbContainer.Visibility == Visibility.Collapsed)
{
To = 0,
Duration = new Duration(TimeSpan.FromMilliseconds(200)),
EasingFunction = new CubicEase { EasingMode = EasingMode.EaseIn },
};
Storyboard.SetTarget(fadeOut, BreadcrumbContainer);
Storyboard.SetTargetProperty(fadeOut, "Opacity");
return;
}
_breadcrumbStoryboard = new Storyboard();
_breadcrumbStoryboard.Children.Add(fadeOut);
_breadcrumbStoryboard.Completed += (_, _) =>
{
BreadcrumbContainer.Visibility = Visibility.Collapsed;
BreadcrumbContainer.Opacity = 1;
_breadcrumbStoryboard = null;
};
_breadcrumbStoryboard.Begin();
_breadcrumbFadeInStoryboard.Stop();
_breadcrumbFadeOutStoryboard.Stop();
_breadcrumbFadeOutStoryboard.Begin();
}
private void ShowBreadcrumb()
{
_breadcrumbStoryboard?.Stop();
_breadcrumbStoryboard = null;
_breadcrumbFadeInStoryboard.Stop();
_breadcrumbFadeOutStoryboard.Stop();
if (BreadcrumbContainer.Visibility == Visibility.Collapsed)
{
BreadcrumbContainer.Opacity = 0;
BreadcrumbContainer.Visibility = Visibility.Visible;
var fadeIn = new DoubleAnimation
{
To = 1,
Duration = new Duration(TimeSpan.FromMilliseconds(250)),
EasingFunction = new CubicEase { EasingMode = EasingMode.EaseOut },
};
Storyboard.SetTarget(fadeIn, BreadcrumbContainer);
Storyboard.SetTargetProperty(fadeIn, "Opacity");
_breadcrumbStoryboard = new Storyboard();
_breadcrumbStoryboard.Children.Add(fadeIn);
_breadcrumbStoryboard.Completed += (_, _) => _breadcrumbStoryboard = null;
_breadcrumbStoryboard.Begin();
_breadcrumbFadeInStoryboard.Begin();
}
else
{
BreadcrumbContainer.Visibility = Visibility.Visible;
BreadcrumbContainer.Opacity = 1;
}
}
@@ -382,7 +361,7 @@ public sealed partial class SettingsWindow : WindowEx,
private void NavFrame_OnNavigated(object sender, NavigationEventArgs e)
{
BreadCrumbs.Clear();
ShowBreadcrumb();
var shouldShowBreadcrumb = true;
if (e.SourcePageType == typeof(GeneralPage))
{
@@ -405,14 +384,14 @@ public sealed partial class SettingsWindow : WindowEx,
else if (e.SourcePageType == typeof(ExtensionGalleryPage))
{
NavView.SelectedItem = GalleryPageNavItem;
HideBreadcrumb();
shouldShowBreadcrumb = false;
var pageType = RS_.GetString("Settings_PageTitles_GalleryPage");
BreadCrumbs.Add(new(pageType, pageType));
}
else if (e.SourcePageType == typeof(ExtensionGalleryItemPage) && e.Parameter is ExtensionGalleryItemViewModel galleryExtension)
{
NavView.SelectedItem = GalleryPageNavItem;
HideBreadcrumb();
shouldShowBreadcrumb = false;
var galleryPageType = RS_.GetString("Settings_PageTitles_GalleryPage");
BreadCrumbs.Add(new(galleryPageType, "Gallery"));
BreadCrumbs.Add(new(galleryExtension.Title, galleryExtension));
@@ -441,6 +420,15 @@ public sealed partial class SettingsWindow : WindowEx,
BreadCrumbs.Add(new($"[{e.SourcePageType?.Name}]", string.Empty));
Logger.LogError($"Unknown breadcrumb for page type '{e.SourcePageType}'");
}
if (shouldShowBreadcrumb)
{
ShowBreadcrumb();
}
else
{
HideBreadcrumb();
}
}
private void CloseScreenshotViewerButton_Click(object sender, RoutedEventArgs e)