From 8c746bd6afa7c3234ebfc8986809aa1662b79513 Mon Sep 17 00:00:00 2001 From: CinkaFox Date: Fri, 10 Apr 2026 19:08:53 +0300 Subject: [PATCH] - tweak: flexbox think --- LaborWork.sln.DotSettings.user | 2 + LaborWork/Converters.cs | 2 +- LaborWork/ViewModels/MainViewModel.cs | 3 + LaborWork/Views/MainView.axaml | 223 ++++++++++++++++++-------- 4 files changed, 163 insertions(+), 67 deletions(-) diff --git a/LaborWork.sln.DotSettings.user b/LaborWork.sln.DotSettings.user index 25bd25d..fa3ea35 100644 --- a/LaborWork.sln.DotSettings.user +++ b/LaborWork.sln.DotSettings.user @@ -1,3 +1,5 @@  ForceIncluded + ForceIncluded + ForceIncluded ForceIncluded \ No newline at end of file diff --git a/LaborWork/Converters.cs b/LaborWork/Converters.cs index 7c7a6f0..5b24b84 100644 --- a/LaborWork/Converters.cs +++ b/LaborWork/Converters.cs @@ -11,7 +11,7 @@ public class PauseConverter : IValueConverter public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) { - return value is true ? "Продолжить" : "Пауза"; + return value is true ? "▶" : "||"; } public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) diff --git a/LaborWork/ViewModels/MainViewModel.cs b/LaborWork/ViewModels/MainViewModel.cs index a510679..448e7ad 100644 --- a/LaborWork/ViewModels/MainViewModel.cs +++ b/LaborWork/ViewModels/MainViewModel.cs @@ -21,6 +21,9 @@ public partial class MainViewModel : ViewModelBase partial void OnArraySizeChanged(int value) { + if (IsSorting) + StopSort(); + GenerateArray(); } diff --git a/LaborWork/Views/MainView.axaml b/LaborWork/Views/MainView.axaml index 01d4d56..d253d1c 100644 --- a/LaborWork/Views/MainView.axaml +++ b/LaborWork/Views/MainView.axaml @@ -1,6 +1,5 @@ - - - - - - - - - + + + + + - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - \ No newline at end of file + +