Browse Source

didn't need global event

pull/240/head
JT 1 year ago
parent
commit
f4a0486e63
  1. 1
      StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
  2. 16
      StabilityMatrix.Avalonia/Views/CheckpointsPage.axaml.cs
  3. 4
      StabilityMatrix.Core/Helper/EventManager.cs

1
StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs

@ -143,7 +143,6 @@ public partial class CheckpointsPageViewModel : PageViewModelBase
) )
{ {
settingsManager.Transaction(s => s.ShowConnectedModelImages = value); settingsManager.Transaction(s => s.ShowConnectedModelImages = value);
EventManager.Instance.OnInvalidateRepeaterRequested();
} }
} }

16
StabilityMatrix.Avalonia/Views/CheckpointsPage.axaml.cs

@ -5,7 +5,9 @@ using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using DynamicData.Binding;
using StabilityMatrix.Avalonia.Controls; using StabilityMatrix.Avalonia.Controls;
using StabilityMatrix.Avalonia.ViewModels;
using StabilityMatrix.Core.Attributes; using StabilityMatrix.Core.Attributes;
using StabilityMatrix.Core.Helper; using StabilityMatrix.Core.Helper;
using CheckpointFolder = StabilityMatrix.Avalonia.ViewModels.CheckpointManager.CheckpointFolder; using CheckpointFolder = StabilityMatrix.Avalonia.ViewModels.CheckpointManager.CheckpointFolder;
@ -34,16 +36,14 @@ public partial class CheckpointsPage : UserControlBase
protected override void OnLoaded(RoutedEventArgs e) protected override void OnLoaded(RoutedEventArgs e)
{ {
base.OnLoaded(e); base.OnLoaded(e);
EventManager.Instance.InvalidateRepeaterRequested += OnInvalidateRepeaterRequested; if (DataContext is CheckpointsPageViewModel vm)
} {
vm.WhenPropertyChanged(v => v.ShowConnectedModelImages)
protected override void OnUnloaded(RoutedEventArgs e) .Subscribe(_ => InvalidateRepeater());
{ }
base.OnUnloaded(e);
EventManager.Instance.InvalidateRepeaterRequested -= OnInvalidateRepeaterRequested;
} }
private void OnInvalidateRepeaterRequested(object? sender, EventArgs e) private void InvalidateRepeater()
{ {
repeater ??= this.FindControl<ItemsControl>("FilesRepeater"); repeater ??= this.FindControl<ItemsControl>("FilesRepeater");
repeater?.InvalidateArrange(); repeater?.InvalidateArrange();

4
StabilityMatrix.Core/Helper/EventManager.cs

@ -37,7 +37,6 @@ public class EventManager
public event EventHandler<FilePath>? ImageFileAdded; public event EventHandler<FilePath>? ImageFileAdded;
public event EventHandler<LocalImageFile>? InferenceTextToImageRequested; public event EventHandler<LocalImageFile>? InferenceTextToImageRequested;
public event EventHandler<LocalImageFile>? InferenceUpscaleRequested; public event EventHandler<LocalImageFile>? InferenceUpscaleRequested;
public event EventHandler? InvalidateRepeaterRequested;
public void OnGlobalProgressChanged(int progress) => public void OnGlobalProgressChanged(int progress) =>
GlobalProgressChanged?.Invoke(this, progress); GlobalProgressChanged?.Invoke(this, progress);
@ -84,7 +83,4 @@ public class EventManager
public void OnInferenceUpscaleRequested(LocalImageFile imageFile) => public void OnInferenceUpscaleRequested(LocalImageFile imageFile) =>
InferenceUpscaleRequested?.Invoke(this, imageFile); InferenceUpscaleRequested?.Invoke(this, imageFile);
public void OnInvalidateRepeaterRequested() =>
InvalidateRepeaterRequested?.Invoke(this, EventArgs.Empty);
} }

Loading…
Cancel
Save