Skip to content
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

Jump to bottom

Added MaterialDesignDefaultContextMenu with SelectAll #1784

Merged
merged 1 commit into from May 3, 2020
Merged

Added MaterialDesignDefaultContextMenu with SelectAll #1784

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 4 additions & 22 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
View file
Open in desktop
Expand Up @@ -5,8 +5,9 @@
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Shadows.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml" />
<ResourceDictionary Source="MaterialDesignTheme.Shadows.xaml" />
<ResourceDictionary Source="MaterialDesignTheme.ValidationErrorTemplate.xaml" />
<ResourceDictionary Source="MaterialDesignTheme.Menu.xaml" />
</ResourceDictionary.MergedDictionaries>

<converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" IsNotEmptyValue="Collapsed" />
Expand Down Expand Up @@ -200,26 +201,7 @@
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="ContextMenu">
<Setter.Value>
<ContextMenu>
<MenuItem Command="Cut">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentCut"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="Copy">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentCopy" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="Paste">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentPaste"/>
</MenuItem.Icon>
</MenuItem>
</ContextMenu>
</Setter.Value>
<Setter Property="ContextMenu" Value="{StaticResource MaterialDesignDefaultContextMenu}">
</Setter>
</Style>

Expand Down
24 changes: 2 additions & 22 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="MaterialDesignTheme.Calendar.xaml" />
<ResourceDictionary Source="MaterialDesignTheme.ValidationErrorTemplate.xaml" />
<ResourceDictionary Source="MaterialDesignTheme.Menu.xaml" />
</ResourceDictionary.MergedDictionaries>

<converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
Expand All @@ -27,28 +28,7 @@
<Setter Property="VerticalContentAlignment" Value="Top"/>
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
<Setter Property="wpf:HintAssist.Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
<!-- cludge the default context menu -->
<Setter Property="ContextMenu">
<Setter.Value>
<ContextMenu>
<MenuItem Command="Cut">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentCut"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="Copy">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentCopy" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="Paste">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentPaste"/>
</MenuItem.Icon>
</MenuItem>
</ContextMenu>
</Setter.Value>
</Setter>
<Setter Property="ContextMenu" Value="{StaticResource MaterialDesignDefaultContextMenu}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DatePickerTextBox}">
Expand Down
24 changes: 24 additions & 0 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Menu.xaml
View file
Open in desktop
Expand Up @@ -8,6 +8,30 @@

<converters:TextFieldHintVisibilityConverter x:Key="StringIsEmptyVisibilityConverter" IsEmptyValue="Collapsed" IsNotEmptyValue="Visible"/>
<converters:BrushRoundConverter x:Key="BrushRoundConverter"/>

<ContextMenu x:Key="MaterialDesignDefaultContextMenu">
<MenuItem Command="Cut">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentCut" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="Copy">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentCopy" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="Paste">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentPaste" />
</MenuItem.Icon>
</MenuItem>
<Separator />
<MenuItem Command="SelectAll">
<MenuItem.Icon>
<wpf:PackIcon Kind="SelectAll" />
</MenuItem.Icon>
</MenuItem>
</ContextMenu>

<Style x:Key="MaterialDesignSeparator" TargetType="{x:Type Separator}">
<Setter Property="Background" Value="{DynamicResource MaterialDesignSelection}"/>
Expand Down
23 changes: 2 additions & 21 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="MaterialDesignTheme.ValidationErrorTemplate.xaml" />
<ResourceDictionary Source="MaterialDesignTheme.Menu.xaml" />
</ResourceDictionary.MergedDictionaries>

<converters:BooleanToVisibilityConverter x:Key="InverseBoolToVisConverter" TrueValue="Collapsed" FalseValue="Visible"/>
Expand Down Expand Up @@ -34,27 +35,7 @@
<Setter Property="wpf:TextFieldAssist.UnderlineBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="wpf:HintAssist.Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="Cursor" Value="IBeam"/>
<Setter Property="ContextMenu">
<Setter.Value>
<ContextMenu>
<MenuItem Command="Cut">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentCut" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="Copy">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentCopy" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="Paste">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentPaste" />
</MenuItem.Icon>
</MenuItem>
</ContextMenu>
</Setter.Value>
</Setter>
<Setter Property="ContextMenu" Value="{StaticResource MaterialDesignDefaultContextMenu}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type PasswordBox}">
Expand Down
24 changes: 2 additions & 22 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="MaterialDesignTheme.ValidationErrorTemplate.xaml" />
<ResourceDictionary Source="MaterialDesignTheme.Menu.xaml" />
</ResourceDictionary.MergedDictionaries>

<converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
Expand Down Expand Up @@ -33,28 +34,7 @@
<Setter Property="wpf:TextFieldAssist.IncludeSpellingSuggestions" Value="{Binding RelativeSource={RelativeSource Self}, Path=(SpellCheck.IsEnabled)}" />
<Setter Property="wpf:TextFieldAssist.UnderlineBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="wpf:HintAssist.Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
<!-- cludge the default context menu -->
<Setter Property="ContextMenu">
<Setter.Value>
<ContextMenu>
<MenuItem Command="Cut">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentCut"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="Copy">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentCopy" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="Paste">
<MenuItem.Icon>
<wpf:PackIcon Kind="ContentPaste"/>
</MenuItem.Icon>
</MenuItem>
</ContextMenu>
</Setter.Value>
</Setter>
<Setter Property="ContextMenu" Value="{StaticResource MaterialDesignDefaultContextMenu}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TextBoxBase}">
Expand Down