Skip to content

Fix settings icon not properly animating, minor refactor #1313

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

Merged
marcelwgn merged 7 commits into from
Nov 1, 2023
Merged

Fix settings icon not properly animating, minor refactor #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e300dee
Fix settings icon not properly animating, minor refactor
marcelwgn Jul 5, 2023
2dacc65
Add comment
marcelwgn Jul 5, 2023
84cffa5
Merge branch 'main' into dev/870-fix-settings-icon-animation-lag
marcelwgn Aug 28, 2023
d12671c
Merge branch 'main' into dev/870-fix-settings-icon-animation-lag
marcelwgn Oct 31, 2023
b45b126
Empty commit to trigger CI
marcelwgn Oct 31, 2023
b8df11d
Empty commit to trigger CI
marcelwgn Nov 1, 2023
ac82b30
Update SettingsPage.xaml
marcelwgn Nov 1, 2023
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: 1 addition & 1 deletion WinUIGallery/SettingsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</toolkit:SettingsExpander.Items>
</toolkit:SettingsExpander>

<toolkit:SettingsExpander x:Name="ScreenshotCard" Header="Screenshot mode">
<toolkit:SettingsExpander x:Name="ScreenshotCard" Header="Screenshot mode" Visibility="Collapsed">
<toolkit:SettingsExpander.HeaderIcon>
<FontIcon Glyph="&#xEC4F;" />
</toolkit:SettingsExpander.HeaderIcon>
Expand Down
27 changes: 18 additions & 9 deletions WinUIGallery/SettingsPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,12 @@ public string Version
}

public string WinAppSdkRuntimeDetails => App.WinAppSdkRuntimeDetails;
private int lastNavigationSelectionMode = 0;

public SettingsPage()
{
this.InitializeComponent();
Loaded += OnSettingsPageLoaded;

if (ElementSoundPlayer.State == ElementSoundPlayerState.On)
soundToggle.IsOn = true;
if (ElementSoundPlayer.SpatialAudioMode == ElementSpatialAudioMode.On)
spatialSoundBox.IsOn = true;

ScreenshotCard.Visibility = Visibility.Collapsed;
}

protected override void OnNavigatedTo(NavigationEventArgs e)
Expand Down Expand Up @@ -81,7 +75,16 @@ private void OnSettingsPageLoaded(object sender, RoutedEventArgs e)
{
navigationLocation.SelectedIndex = 1;
}
}
lastNavigationSelectionMode = navigationLocation.SelectedIndex;
}

if (ElementSoundPlayer.State == ElementSoundPlayerState.On)
soundToggle.IsOn = true;
if (ElementSoundPlayer.SpatialAudioMode == ElementSpatialAudioMode.On)
spatialSoundBox.IsOn = true;
#if DEBUG
ScreenshotCard.Visibility = Visibility.Visible;
#endif
}

private void themeMode_SelectionChanged(object sender, RoutedEventArgs e)
Expand Down Expand Up @@ -137,7 +140,13 @@ private void screenshotModeToggle_Toggled(object sender, RoutedEventArgs e)

private void navigationLocation_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
NavigationOrientationHelper.IsLeftModeForElement(navigationLocation.SelectedIndex == 0, this);
// Since setting the left mode does not look at the old setting we
// need to check if this is an actual update
if (navigationLocation.SelectedIndex != lastNavigationSelectionMode)
{
NavigationOrientationHelper.IsLeftModeForElement(navigationLocation.SelectedIndex == 0, this);
lastNavigationSelectionMode = navigationLocation.SelectedIndex;
}
}

private async void FolderButton_Click(object sender, RoutedEventArgs e)
Expand Down