Skip to content

Commit aab34af

Browse files
committed
Merge branch 'FixMenuItem' of https://github.com/l1pton17/MaterialDesignInXamlToolkit into l1pton17-FixMenuItem
2 parents 60f7156 + 092b93a commit aab34af

File tree

3 files changed

+170
-65
lines changed

3 files changed

+170
-65
lines changed

MainDemo.Wpf/MenusAndToolBars.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</MenuItem.Icon>
1919
</MenuItem>
2020
<MenuItem Header="Save As.." />
21-
<MenuItem Header="Exit">
21+
<MenuItem Header="Exit" InputGestureText="Ctrl+E">
2222
<MenuItem.Icon>
2323
<Viewbox Width="16" Height="16">
2424
<Canvas Width="24" Height="24">
@@ -30,9 +30,9 @@
3030
<Separator />
3131
<MenuItem Header="Excellent" IsCheckable="True" IsChecked="True" />
3232
<MenuItem Header="Rubbish" IsCheckable="True" />
33-
<MenuItem Header="Dig Deeper">
34-
<MenuItem Header="Enlightenment?" />
35-
<MenuItem Header="Disappointment" />
33+
<MenuItem Header="Dig Deeper" InputGestureText="Ctrl+D">
34+
<MenuItem Header="Enlightenment?" IsCheckable="True" />
35+
<MenuItem Header="Disappointment" IsCheckable="True" />
3636
</MenuItem>
3737
</MenuItem>
3838
<MenuItem Header="_Edit">

MaterialDesignThemes.Wpf/Converters/TextFieldHintVisibilityConverter.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ namespace MaterialDesignThemes.Wpf.Converters
77
{
88
public class TextFieldHintVisibilityConverter : IValueConverter
99
{
10+
public Visibility IsEmptyValue { get; set; } = Visibility.Visible;
11+
public Visibility IsNotEmptyValue { get; set; } = Visibility.Hidden;
12+
1013
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
1114
{
12-
return string.IsNullOrEmpty((value ?? "").ToString()) ? Visibility.Visible : Visibility.Hidden;
15+
return string.IsNullOrEmpty((value ?? "").ToString()) ? IsEmptyValue : IsNotEmptyValue;
1316
}
1417

1518
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

0 commit comments

Comments
 (0)