Skip to content

Commit b72e2b1

Browse files
authored
Fix: Fixed issue where properties were sometimes not displayed in the details pane (#12952)
1 parent 0c58a82 commit b72e2b1

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ namespace Files.App.ViewModels.UserControls
1414
{
1515
public class PreviewPaneViewModel : ObservableObject, IDisposable
1616
{
17-
private readonly IUserSettingsService userSettingsService;
18-
1917
private readonly IPreviewPaneSettingsService previewSettingsService;
2018

2119
private readonly IContentPageContext contentPageContextService;
@@ -69,16 +67,14 @@ public UIElement PreviewPaneContent
6967
set => SetProperty(ref previewPaneContent, value);
7068
}
7169

72-
public PreviewPaneViewModel(IUserSettingsService userSettings, IPreviewPaneSettingsService previewSettings, IContentPageContext contentPageContextService = null)
70+
public PreviewPaneViewModel(IPreviewPaneSettingsService previewSettings, IContentPageContext contentPageContextService = null)
7371
{
74-
userSettingsService = userSettings;
7572
previewSettingsService = previewSettings;
7673

7774
ShowPreviewOnlyInvoked = new RelayCommand(async () => await UpdateSelectedItemPreview());
7875

7976
IsEnabled = previewSettingsService.IsEnabled;
8077

81-
userSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
8278
previewSettingsService.PropertyChanged += PreviewSettingsService_OnPropertyChangedEvent;
8379

8480
this.contentPageContextService = contentPageContextService ?? Ioc.Default.GetRequiredService<IContentPageContext>();
@@ -313,18 +309,14 @@ public async Task UpdateSelectedItemPreview(bool downloadItem = false)
313309

314310
public ICommand ShowPreviewOnlyInvoked { get; }
315311

316-
private async void UserSettingsService_OnSettingChangedEvent(object sender, SettingChangedEventArgs e)
312+
private async void PreviewSettingsService_OnPropertyChangedEvent(object sender, PropertyChangedEventArgs e)
317313
{
318-
if (e.SettingName is nameof(IPreviewPaneSettingsService.ShowPreviewOnly))
314+
if (e.PropertyName is nameof(IPreviewPaneSettingsService.ShowPreviewOnly))
319315
{
320316
// The preview will need refreshing as the file details won't be accurate
321317
await UpdateSelectedItemPreview();
322318
}
323-
}
324-
325-
private void PreviewSettingsService_OnPropertyChangedEvent(object sender, PropertyChangedEventArgs e)
326-
{
327-
if (e.PropertyName is nameof(IPreviewPaneSettingsService.IsEnabled))
319+
else if (e.PropertyName is nameof(IPreviewPaneSettingsService.IsEnabled))
328320
{
329321
var newEnablingStatus = previewSettingsService.IsEnabled;
330322
if (isEnabled != newEnablingStatus)
@@ -353,7 +345,6 @@ private async Task LoadBasicPreviewAsync()
353345

354346
public void Dispose()
355347
{
356-
userSettingsService.OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEvent;
357348
previewSettingsService.PropertyChanged -= PreviewSettingsService_OnPropertyChangedEvent;
358349
}
359350
}

0 commit comments

Comments
 (0)