Allow MaxWidth to be set on popups as well

quicoli · Mar 3, 2022 · ec62553 · ec62553
1 parent 7e8b891
commit ec62553
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/AutoCompleteTextBox/AutoCompleteTextBox/Editors/AutoCompleteComboBox.cs b/AutoCompleteTextBox/AutoCompleteTextBox/Editors/AutoCompleteComboBox.cs
@@ -43,6 +43,7 @@ public class AutoCompleteComboBox : Control
         public static readonly DependencyProperty MaxLengthProperty = DependencyProperty.Register("MaxLength", typeof(int), typeof(AutoCompleteComboBox), new FrameworkPropertyMetadata(0));
         public static readonly DependencyProperty CharacterCasingProperty = DependencyProperty.Register("CharacterCasing", typeof(CharacterCasing), typeof(AutoCompleteComboBox), new FrameworkPropertyMetadata(CharacterCasing.Normal));
         public static readonly DependencyProperty MaxPopUpHeightProperty = DependencyProperty.Register("MaxPopUpHeight", typeof(int), typeof(AutoCompleteComboBox), new FrameworkPropertyMetadata(600));
+        public static readonly DependencyProperty MaxPopUpWidthProperty = DependencyProperty.Register("MaxPopUpWidth", typeof(int), typeof(AutoCompleteComboBox), new FrameworkPropertyMetadata(2000));
 
         public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register("Watermark", typeof(string), typeof(AutoCompleteComboBox), new FrameworkPropertyMetadata(string.Empty));
 
@@ -72,6 +73,11 @@ public int MaxPopupHeight
             get => (int)GetValue(MaxPopUpHeightProperty);
             set => SetValue(MaxPopUpHeightProperty, value);
         }
+        public int MaxPopupWidth
+        {
+            get => (int)GetValue(MaxPopUpWidthProperty);
+            set => SetValue(MaxPopUpWidthProperty, value);
+        }
 
 
         public BindingEvaluator BindingEvaluator { get; set; }

diff --git a/AutoCompleteTextBox/AutoCompleteTextBox/Editors/AutoCompleteTextBox.cs b/AutoCompleteTextBox/AutoCompleteTextBox/Editors/AutoCompleteTextBox.cs
@@ -41,6 +41,7 @@ public class AutoCompleteTextBox : Control
         public static readonly DependencyProperty MaxLengthProperty = DependencyProperty.Register("MaxLength", typeof(int), typeof(AutoCompleteTextBox), new FrameworkPropertyMetadata(0));
         public static readonly DependencyProperty CharacterCasingProperty = DependencyProperty.Register("CharacterCasing", typeof(CharacterCasing), typeof(AutoCompleteTextBox), new FrameworkPropertyMetadata(CharacterCasing.Normal));
         public static readonly DependencyProperty MaxPopUpHeightProperty = DependencyProperty.Register("MaxPopUpHeight", typeof(int), typeof(AutoCompleteTextBox), new FrameworkPropertyMetadata(600));
+        public static readonly DependencyProperty MaxPopUpWidthProperty = DependencyProperty.Register("MaxPopUpWidth", typeof(int), typeof(AutoCompleteTextBox), new FrameworkPropertyMetadata(2000));
 
         public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register("Watermark", typeof(string), typeof(AutoCompleteTextBox), new FrameworkPropertyMetadata(string.Empty));
 
@@ -70,7 +71,11 @@ public int MaxPopupHeight
             get => (int)GetValue(MaxPopUpHeightProperty);
             set => SetValue(MaxPopUpHeightProperty, value);
         }
-
+        public int MaxPopupWidth
+        {
+            get => (int)GetValue(MaxPopUpWidthProperty);
+            set => SetValue(MaxPopUpWidthProperty, value);
+        }
 
         public BindingEvaluator BindingEvaluator { get; set; }
 

diff --git a/AutoCompleteTextBox/AutoCompleteTextBox/Editors/Themes/Generic.xaml b/AutoCompleteTextBox/AutoCompleteTextBox/Editors/Themes/Generic.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:editors="clr-namespace:AutoCompleteTextBox.Editors">
@@ -112,6 +112,7 @@
                                         <ListBox
                                             x:Name="PART_Selector"
                                             MaxHeight="{Binding Path=MaxPopupHeight, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
+											MaxWidth="{Binding Path=MaxPopupWidth, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
                                             Background="{Binding Path=SuggestionBackground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=editors:AutoCompleteTextBox}, Mode=OneWay}"
                                             BorderThickness="0"
                                             Focusable="False"
@@ -210,6 +211,7 @@
                                     <ListBox
                                         x:Name="PART_Selector"
                                         MaxHeight="{Binding Path=MaxPopupHeight, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
+										MaxWidth="{Binding Path=MaxPopupWidth, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
                                         Background="{Binding Path=SuggestionBackground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=editors:AutoCompleteComboBox}, Mode=OneWay}"
                                         BorderThickness="0"
                                         Focusable="False"