Merge branch 'develop' into datagrid-rowheader-alignment

MahApps · Dec 22, 2016 · a6e8edf · a6e8edf
2 parents 833639e + 28709a3
commit a6e8edf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/docs/release-notes/1.4.0.md b/docs/release-notes/1.4.0.md
@@ -123,3 +123,4 @@
 - [#2346](https://github.com/MahApps/MahApps.Metro/issues/2346) TabControl with VS style
 - [#2090](https://github.com/MahApps/MahApps.Metro/issues/2090) VS TabItem
 - [#1890](https://github.com/MahApps/MahApps.Metro/issues/1890) How do i use the CloseCommand in StandardTabControl with VS Style
+- [#2261](https://github.com/MahApps/MahApps.Metro/issues/2261) ComboBox context menu.
diff --git a/....Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml b/....Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml
@@ -133,6 +133,11 @@
                           Controls:TextBoxHelper.ClearTextButton="True"
                           Controls:TextBoxHelper.Watermark="Please select an item..."
                           SelectedIndex="0">
+                    <ComboBox.ContextMenu>
+                        <ContextMenu>
+                            <MenuItem Header="Test" />
+                        </ContextMenu>
+                    </ComboBox.ContextMenu>
                     <ComboBoxItem Content="Item 1" />
                     <ComboBoxItem Content="Item 2" />
                     <ComboBoxItem Content="Very long Item 3 for MahApps.Metro" />
@@ -145,6 +150,10 @@
                           Controls:TextBoxHelper.UseFloatingWatermark="True"
                           IsEditable="True"
                           SelectedIndex="0">
+                    <ComboBox.ContextMenu>
+                        <ContextMenu IsEnabled="False"
+                                     Visibility="Collapsed" />
+                    </ComboBox.ContextMenu>
                     <ComboBoxItem Content="Item 1" />
                     <ComboBoxItem Content="Item 2" />
                     <ComboBoxItem Content="Very long Item 3 for MahApps.Metro" />

diff --git a/src/MahApps.Metro/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -471,6 +471,14 @@
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
                     <ControlTemplate.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ContextMenu, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter TargetName="PART_EditableTextBox" Property="ContextMenu" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContextMenu}" />
+                        </MultiDataTrigger>
+
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="False" />