diff --git a/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/SnackbarViewModel.cs b/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/SnackbarViewModel.cs index d9b8b694c..aa76e0571 100644 --- a/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/SnackbarViewModel.cs +++ b/src/Wpf.Ui.Gallery/ViewModels/Pages/DialogsAndFlyouts/SnackbarViewModel.cs @@ -3,23 +3,23 @@ // Copyright (C) Leszek Pomianowski and WPF UI Contributors. // All Rights Reserved. -using CommunityToolkit.Mvvm.ComponentModel; -using CommunityToolkit.Mvvm.Input; -using Wpf.Ui.Contracts; using Wpf.Ui.Controls; using Wpf.Ui.Controls.IconElements; -using SymbolIcon = Wpf.Ui.Controls.IconElements.SymbolIcon; namespace Wpf.Ui.Gallery.ViewModels.Pages.DialogsAndFlyouts; public partial class SnackbarViewModel : ObservableObject { - private readonly ISnackbarService _snackbarService; + public SnackbarViewModel(ISnackbarService snackbarService) + { + _snackbarService = snackbarService; + } + private readonly ISnackbarService _snackbarService; private ControlAppearance _snackbarAppearance = ControlAppearance.Secondary; [ObservableProperty] - private int _snackbarTimeout = 2000; + private int _snackbarTimeout = 2; private int _snackbarAppearanceComboBoxSelectedIndex = 1; @@ -33,16 +33,11 @@ public int SnackbarAppearanceComboBoxSelectedIndex } } - public SnackbarViewModel(ISnackbarService snackbarService) - { - _snackbarService = snackbarService; - } - [RelayCommand] private void OnOpenSnackbar(object sender) { - _snackbarService.Timeout = SnackbarTimeout; - _snackbarService.Show("Don't Blame Yourself.", "No Witcher's Ever Died In His Bed.", new SymbolIcon(SymbolRegular.Fluent24), _snackbarAppearance); + _snackbarService.Show("Don't Blame Yourself.", "No Witcher's Ever Died In His Bed.", _snackbarAppearance, + new SymbolIcon(SymbolRegular.Fluent24), TimeSpan.FromSeconds(SnackbarTimeout)); } private void UpdateSnackbarAppearance(int appearanceIndex) diff --git a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/SnackbarPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/SnackbarPage.xaml index c876d9349..b76cae249 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/SnackbarPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/DialogsAndFlyouts/SnackbarPage.xaml @@ -85,9 +85,9 @@ AutoToolTipPlacement="BottomRight" AutoToolTipPrecision="0" IsSnapToTickEnabled="True" - Maximum="5000" - Minimum="200" - TickFrequency="200" + Maximum="5" + Minimum="1" + TickFrequency="1" TickPlacement="BottomRight" Value="{Binding ViewModel.SnackbarTimeout, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SnackbarPage}, Mode=TwoWay}" /> diff --git a/src/Wpf.Ui.Gallery/Views/Windows/EditorWindow.xaml b/src/Wpf.Ui.Gallery/Views/Windows/EditorWindow.xaml index ae6726a18..4fc53bd9b 100644 --- a/src/Wpf.Ui.Gallery/Views/Windows/EditorWindow.xaml +++ b/src/Wpf.Ui.Gallery/Views/Windows/EditorWindow.xaml @@ -228,10 +228,10 @@ - + Timeout="5000" />--> - + + + + + + - + @@ -179,7 +197,7 @@ - + @@ -196,7 +214,7 @@ - + @@ -213,7 +231,7 @@ - + @@ -230,7 +248,7 @@ - + @@ -247,7 +265,7 @@ - + @@ -264,7 +282,7 @@ - + @@ -281,7 +299,7 @@ - + diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj index 1008ec067..c703d425d 100644 --- a/src/Wpf.Ui/Wpf.Ui.csproj +++ b/src/Wpf.Ui/Wpf.Ui.csproj @@ -112,7 +112,6 @@ -