@@ -14,8 +14,6 @@ namespace Files.App.ViewModels.UserControls
14
14
{
15
15
public class PreviewPaneViewModel : ObservableObject , IDisposable
16
16
{
17
- private readonly IUserSettingsService userSettingsService ;
18
-
19
17
private readonly IPreviewPaneSettingsService previewSettingsService ;
20
18
21
19
private readonly IContentPageContext contentPageContextService ;
@@ -69,16 +67,14 @@ public UIElement PreviewPaneContent
69
67
set => SetProperty ( ref previewPaneContent , value ) ;
70
68
}
71
69
72
- public PreviewPaneViewModel ( IUserSettingsService userSettings , IPreviewPaneSettingsService previewSettings , IContentPageContext contentPageContextService = null )
70
+ public PreviewPaneViewModel ( IPreviewPaneSettingsService previewSettings , IContentPageContext contentPageContextService = null )
73
71
{
74
- userSettingsService = userSettings ;
75
72
previewSettingsService = previewSettings ;
76
73
77
74
ShowPreviewOnlyInvoked = new RelayCommand ( async ( ) => await UpdateSelectedItemPreview ( ) ) ;
78
75
79
76
IsEnabled = previewSettingsService . IsEnabled ;
80
77
81
- userSettingsService . OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent ;
82
78
previewSettingsService . PropertyChanged += PreviewSettingsService_OnPropertyChangedEvent ;
83
79
84
80
this . contentPageContextService = contentPageContextService ?? Ioc . Default . GetRequiredService < IContentPageContext > ( ) ;
@@ -313,18 +309,14 @@ public async Task UpdateSelectedItemPreview(bool downloadItem = false)
313
309
314
310
public ICommand ShowPreviewOnlyInvoked { get ; }
315
311
316
- private async void UserSettingsService_OnSettingChangedEvent ( object sender , SettingChangedEventArgs e )
312
+ private async void PreviewSettingsService_OnPropertyChangedEvent ( object sender , PropertyChangedEventArgs e )
317
313
{
318
- if ( e . SettingName is nameof ( IPreviewPaneSettingsService . ShowPreviewOnly ) )
314
+ if ( e . PropertyName is nameof ( IPreviewPaneSettingsService . ShowPreviewOnly ) )
319
315
{
320
316
// The preview will need refreshing as the file details won't be accurate
321
317
await UpdateSelectedItemPreview ( ) ;
322
318
}
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 ) )
328
320
{
329
321
var newEnablingStatus = previewSettingsService . IsEnabled ;
330
322
if ( isEnabled != newEnablingStatus )
@@ -353,7 +345,6 @@ private async Task LoadBasicPreviewAsync()
353
345
354
346
public void Dispose ( )
355
347
{
356
- userSettingsService . OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEvent ;
357
348
previewSettingsService . PropertyChanged -= PreviewSettingsService_OnPropertyChangedEvent ;
358
349
}
359
350
}
0 commit comments