Skip to content

Fixing Issues #3476 #3478 #3479 #3477

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
merged 1 commit into from
Mar 7, 2024
Merged

Fixing Issues #3476 #3478 #3479 #3477

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
4 changes: 2 additions & 2 deletions MainDemo.Wpf/Fields.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,11 +854,11 @@
</smtx:XamlDisplay>

<TextBlock Grid.Row="1"
Grid.Column="2"
Grid.Column="3"
Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
Text="Outlined AutoSuggestBox" />
<smtx:XamlDisplay Grid.Row="2"
Grid.Column="2"
Grid.Column="3"
UniqueKey="fields_autosuggestion_4">
<materialDesign:AutoSuggestBox materialDesign:HintAssist.Hint="Color"
materialDesign:TextFieldAssist.HasClearButton="True"
Expand Down
2 changes: 1 addition & 1 deletion MaterialDesignThemes.Wpf/AutoSuggestBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ private void AutoSuggestionListBox_PreviewMouseDown(object sender, MouseButtonEv
var selectedItem = element.DataContext;
if (!_autoSuggestBoxList.Items.Contains(selectedItem))
return;
if (_autoSuggestBoxList.SelectedItem != selectedItem)
if (!_autoSuggestBoxList.SelectedItem.Equals(selectedItem))
{
_autoSuggestBoxList.SelectionChanged += OnSelectionChanged;
_autoSuggestBoxList.SelectedItem = selectedItem;
Expand Down
3 changes: 2 additions & 1 deletion MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Style x:Key="MaterialDesignAutoSuggestBoxBase"
TargetType="{x:Type wpf:AutoSuggestBox}"
BasedOn="{StaticResource MaterialDesignTextBoxBase}">
<Setter Property="DropDownBackground" Value="White" />
<Setter Property="DropDownBackground" Value="{DynamicResource MaterialDesign.Brush.Card.Background}" />
<Setter Property="DropDownElevation" Value="Dp2" />
<Setter Property="Template">
<Setter.Value>
Expand Down Expand Up @@ -224,6 +224,7 @@
DisplayMemberPath="{TemplateBinding DisplayMember}"
Focusable="False"
IsSynchronizedWithCurrentItem="True"
SelectedIndex="-1"
ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
ItemTemplate="{TemplateBinding ItemTemplate}"
ItemsSource="{TemplateBinding Suggestions}"
Expand Down