Skip to content

Fixed AutoSuggestion event. #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kinnara merged 1 commit into from
Jun 25, 2022
Merged

Fixed AutoSuggestion event. #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ModernWpf.Controls/AutoSuggestBox/AutoSuggestBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ private void OnDelayTimerTick(object sender, EventArgs e)
if (m_delayTimer.Tag is AutoSuggestionBoxTextChangeReason reason)
{
m_delayTimer.Tag = null;
TextChanged?.Invoke(this, new AutoSuggestBoxTextChangedEventArgs(this, Text) { Reason = reason });
TextChanged?.Invoke(this, new AutoSuggestBoxTextChangedEventArgs(this, Text, reason));
}
}

Expand Down
4 changes: 2 additions & 2 deletions ModernWpf.Controls/AutoSuggestBox/AutoSuggestBoxQuerySubmittedEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Windows;
using System;

namespace ModernWpf.Controls
{
public sealed class AutoSuggestBoxQuerySubmittedEventArgs : DependencyObject
public sealed class AutoSuggestBoxQuerySubmittedEventArgs : EventArgs
{
public AutoSuggestBoxQuerySubmittedEventArgs()
{
Expand Down
4 changes: 2 additions & 2 deletions ModernWpf.Controls/AutoSuggestBox/AutoSuggestBoxSuggestionChosenEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Windows;
using System;

namespace ModernWpf.Controls
{
public sealed class AutoSuggestBoxSuggestionChosenEventArgs : DependencyObject
public sealed class AutoSuggestBoxSuggestionChosenEventArgs : EventArgs
{
public AutoSuggestBoxSuggestionChosenEventArgs()
{
Expand Down
27 changes: 6 additions & 21 deletions ModernWpf.Controls/AutoSuggestBox/AutoSuggestBoxTextChangedEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Windows;

namespace ModernWpf.Controls
{
Expand All @@ -10,35 +9,21 @@ public enum AutoSuggestionBoxTextChangeReason
SuggestionChosen = 2
}

public sealed class AutoSuggestBoxTextChangedEventArgs : DependencyObject
public sealed class AutoSuggestBoxTextChangedEventArgs : EventArgs
{
public AutoSuggestBoxTextChangedEventArgs()
{
}

internal AutoSuggestBoxTextChangedEventArgs(AutoSuggestBox source, string value)
internal AutoSuggestBoxTextChangedEventArgs(AutoSuggestBox source, string value, AutoSuggestionBoxTextChangeReason reason)
{
m_source = new WeakReference<AutoSuggestBox>(source);
m_value = value;
Reason = reason;
}

#region Reason

public static readonly DependencyProperty ReasonProperty =
DependencyProperty.Register(
nameof(Reason),
typeof(AutoSuggestionBoxTextChangeReason),
typeof(AutoSuggestBoxTextChangedEventArgs),
new PropertyMetadata(AutoSuggestionBoxTextChangeReason.ProgrammaticChange));

public AutoSuggestionBoxTextChangeReason Reason
{
get => (AutoSuggestionBoxTextChangeReason)GetValue(ReasonProperty);
set => SetValue(ReasonProperty, value);
}

#endregion


public AutoSuggestionBoxTextChangeReason Reason { get; }

public bool CheckCurrent()
{
return m_source != null &&
Expand Down