Fix widgets not disappearing when removed #3384
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
krschau
requested review from
guimafelipe,
vineeththomasalex,
dkbennett and
AmelBawa-msft
dkbennett
approved these changes
Jul 9, 2024
jaholme
approved these changes
Jul 9, 2024
guimafelipe
approved these changes
Jul 9, 2024
dhoehna
reviewed
Jul 9, 2024
| @@ -177,7 +177,10 @@ private async void OnRemoveWidgetClick(object sender, RoutedEventArgs e) | |||
| _log.Debug($"User removed widget, delete widget {widgetIdToDelete}"); | |||
| var stringResource = new StringResource("DevHome.Dashboard.pri", "DevHome.Dashboard/Resources"); | |||
| Application.Current.GetService<IScreenReaderService>().Announce(stringResource.GetLocalized("WidgetRemoved")); | |||
| Application.Current.GetService<DashboardViewModel>().PinnedWidgets.Remove(widgetViewModel); | |||
| await Application.Current.GetService<DispatcherQueue>().EnqueueAsync(() => | |||
There was a problem hiding this comment.
Does the DispatcherQueue only have an async enqueue?
There was a problem hiding this comment.
Whoops, no. Will fix.
krschau
force-pushed
the
user/krschau/remove-widget
branch
from
a3507c2
to
77f9410
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of the pull request
Fixes a bug where removing a widget did delete the underlying COM widget, but did not remove it from the list, resulting in the removed widget staying on the screen. This was caused by #3297 where the DashboardViewModel became a Transient service. As such, when the WidgetControl got a new DashboardViewModel, it didn't contain the "real" list of widgets". The fix is to change the DashboardViewModel to be Singleton again. We clear the list of PinnedWidgets when the DashboardView is unloaded, so we don't have to worry about adding the same widgets to the list multiple times if the Dashboard is nagivated to multiple times.
Validation steps performed
Validated locally.
PR checklist