From 0c24f05b4f6639014627eb4a4660e88c2d46127e Mon Sep 17 00:00:00 2001 From: Alek-ban Date: Tue, 14 Apr 2026 17:10:02 +0300 Subject: [PATCH] feat: AmineContentView menu disabling when scrolling and when SeparatorCalibrationView menu opened --- GSS2/ViewModels/AmineContentViewModel.cs | 1 + GSS2/Views/AmineContentView.axaml | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/GSS2/ViewModels/AmineContentViewModel.cs b/GSS2/ViewModels/AmineContentViewModel.cs index 98d97de..9008c29 100644 --- a/GSS2/ViewModels/AmineContentViewModel.cs +++ b/GSS2/ViewModels/AmineContentViewModel.cs @@ -22,6 +22,7 @@ public partial class AmineContentViewModel : ViewModelBase [ObservableProperty] public partial SystemViewModel System { get; set; } [ObservableProperty] public partial int CurrentIndex { get; set; } + [ObservableProperty] public partial bool IsScrolling { get; set; } public AmineContentViewModel( NavigationService navigationService, diff --git a/GSS2/Views/AmineContentView.axaml b/GSS2/Views/AmineContentView.axaml index ba59aeb..92b4779 100644 --- a/GSS2/Views/AmineContentView.axaml +++ b/GSS2/Views/AmineContentView.axaml @@ -4,6 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:vm="using:GSS2.ViewModels" xmlns:core="using:GSS2.UI.Core" + xmlns:avalonia_converters="using:Avalonia.Data.Converters" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:DataType="vm:AmineContentViewModel"> @@ -44,6 +45,14 @@ + + + + + + + + @@ -95,7 +104,7 @@ - +