Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename MinSizeFilter, MaxSizeFilter to MinModlistSize, MaxModlistSize

Browse Source
This commit is contained in:
trawzified 2023-12-31 11:25:14 +01:00
parent 58d0fdc9c3
commit ea59cd2e0e
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Wabbajack.App.Wpf/ViewModels/Gallery/ModListGalleryVM.cs
View File

@ -46,8 +46,8 @@ namespace Wabbajack
[Reactive] public bool ShowUnofficialLists { get; set; } [Reactive] public bool ShowUnofficialLists { get; set; }
[Reactive] public string GameType { get; set; } [Reactive] public string GameType { get; set; }
[Reactive] public double MinSizeFilter { get; set; } [Reactive] public double MinModlistSize { get; set; }
[Reactive] public double MaxSizeFilter { get; set; } [Reactive] public double MaxModlistSize { get; set; }
[Reactive] public ModListMetadataVM MinSizeModlist { get; set; } [Reactive] public ModListMetadataVM MinSizeModlist { get; set; }
[Reactive] public ModListMetadataVM MaxSizeModlist { get; set; } [Reactive] public ModListMetadataVM MaxSizeModlist { get; set; }
@ -130,6 +130,8 @@ namespace Wabbajack
Disposable.Create(() => SaveSettings().FireAndForget()) Disposable.Create(() => SaveSettings().FireAndForget())
.DisposeWith(disposables); .DisposeWith(disposables);
this.ObservableForProperty(vm => vm.MinModlistSize)
var searchTextPredicates = this.ObservableForProperty(vm => vm.Search) var searchTextPredicates = this.ObservableForProperty(vm => vm.Search)
.Throttle(searchThrottle, RxApp.MainThreadScheduler) .Throttle(searchThrottle, RxApp.MainThreadScheduler)
.Select(change => change.Value.Trim()) .Select(change => change.Value.Trim())
@ -175,7 +177,7 @@ namespace Wabbajack
}) })
.StartWith(_ => true); .StartWith(_ => true);
var minSizeFilter = this.ObservableForProperty(vm => vm.MinSizeFilter) var minSizeFilter = this.ObservableForProperty(vm => vm.MinModlistSize)
.Select(v => v.Value) .Select(v => v.Value)
.Select<double, Func<ModListMetadataVM, bool>>(minSize => .Select<double, Func<ModListMetadataVM, bool>>(minSize =>
{ {
@ -185,7 +187,7 @@ namespace Wabbajack
}; };
}); });
var maxSizeFilter = this.ObservableForProperty(vm => vm.MaxSizeFilter) var maxSizeFilter = this.ObservableForProperty(vm => vm.MaxModlistSize)
.Select(v => v.Value) .Select(v => v.Value)
.Select<double, Func<ModListMetadataVM, bool>>(maxSize => .Select<double, Func<ModListMetadataVM, bool>>(maxSize =>
{ {

10
Wabbajack.App.Wpf/Views/ModListGalleryView.xaml.cs
View File

@ -65,18 +65,12 @@ namespace Wabbajack
this.WhenAny(x => x.SizeSliderFilter.LowerValue) this.WhenAny(x => x.SizeSliderFilter.LowerValue)
.Select(x => x * Math.Pow(1024, 3)) .Select(x => x * Math.Pow(1024, 3))
.BindToStrict(ViewModel, vm => vm.MinSizeFilter) .BindToStrict(ViewModel, vm => vm.MinModlistSize)
.DisposeWith(dispose); .DisposeWith(dispose);
this.WhenAny(x => x.SizeSliderFilter.UpperValue) this.WhenAny(x => x.SizeSliderFilter.UpperValue)
.Select(x => x * Math.Pow(1024, 3)) .Select(x => x * Math.Pow(1024, 3))
.BindToStrict(ViewModel, vm => vm.MaxSizeFilter) .BindToStrict(ViewModel, vm => vm.MaxModlistSize)
.DisposeWith(dispose); .DisposeWith(dispose);
/*
this.BindStrict(ViewModel, vm => vm.MinSizeFilter, x => x.SizeSliderFilter.LowerValue)
.DisposeWith(dispose);
this.BindStrict(ViewModel, vm => vm.MaxSizeFilter, x => x.SizeSliderFilter.UpperValue)
.DisposeWith(dispose);
*/
this.WhenAny(x => x.ViewModel.ClearFiltersCommand) this.WhenAny(x => x.ViewModel.ClearFiltersCommand)
.BindToStrict(this, x => x.ClearFiltersButton.Command) .BindToStrict(this, x => x.ClearFiltersButton.Command)