Skip to content

Commit 01f6def

Browse files
committed
Fix issue( #102
1 parent c308669 commit 01f6def

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections;
33
using System.Collections.Generic;
4+
using System.ComponentModel;
45
using System.Linq;
56
using System.Runtime.InteropServices;
67
using System.Windows;
@@ -58,7 +59,7 @@ public class MultiSelectionSearchComboBox : Control
5859

5960
public static readonly DependencyProperty SelectAllContentProperty =
6061
DependencyProperty.Register("SelectAllContent", typeof(object), typeof(MultiSelectionSearchComboBox),
61-
new PropertyMetadata("全选"));
62+
new PropertyMetadata(LanguageManager.Instance["SelectAll"]));
6263

6364
public static readonly DependencyProperty IsSelectAllActiveProperty =
6465
DependencyProperty.Register("IsSelectAllActive", typeof(bool), typeof(MultiSelectionSearchComboBox),
@@ -190,6 +191,7 @@ public event RoutedEventHandler Closed
190191
public override void OnApplyTemplate()
191192
{
192193
base.OnApplyTemplate();
194+
LanguageManager.Instance.PropertyChanged += Instance_PropertyChanged;
193195
selectedList = new List<object>();
194196
selectedSearchList = new List<object>();
195197
selectedItems = new List<object>();
@@ -232,6 +234,10 @@ public override void OnApplyTemplate()
232234
}
233235
}
234236

237+
private void Instance_PropertyChanged(object sender, PropertyChangedEventArgs e)
238+
{
239+
SelectAllContent = LanguageManager.Instance["SelectAll"];
240+
}
235241

236242
private void _listBoxSearch_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
237243
{
@@ -380,8 +386,8 @@ private void _listBoxSearch_SelectionChanged(object sender, SelectionChangedEven
380386
if (e.AddedItems.Count > 0)
381387
{
382388
foreach (var item in e.AddedItems)
383-
if (!selectedSearchList.Contains(item))
384-
selectedSearchList.Add(item);
389+
if (!_listBox.SelectedItems.Contains(item))
390+
_listBox.SelectedItems.Add(item);
385391
Combination();
386392
SelectionChecked(_listBoxSearch);
387393
}

0 commit comments

Comments
 (0)