Skip to content

Commit 6e31afb

Browse files
JorisCleVRJorisCleVR
authored
Merge pull request #4 from CleVR-bv/Feature/Removed-global-converter-resources
Removed global converter resources: Handled PR feedback
2 parents ccbeadd + c9bc550 commit 6e31afb

30 files changed

+92
-85
lines changed

‎src/MainDemo.Wpf/Buttons.xaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@
570570
Command="{Binding DismissCommand}"
571571
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
572572
Style="{StaticResource MaterialDesignRaisedButton}"
573-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
573+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
574574
<StackPanel Orientation="Horizontal">
575575
<TextBlock Text="DISMISS" />
576576
<materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -579,7 +579,7 @@
579579

580580
<TextBlock VerticalAlignment="Center"
581581
Text="{Binding DemoRestartCountdownText}"
582-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
582+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
583583
</Grid>
584584
</smtx:XamlDisplay>
585585

@@ -604,7 +604,7 @@
604604
Command="{Binding DismissCommand}"
605605
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
606606
Style="{StaticResource MaterialDesignOutlinedButton}"
607-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
607+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
608608
<StackPanel Orientation="Horizontal">
609609
<TextBlock Text="DISMISS" />
610610
<materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -613,7 +613,7 @@
613613

614614
<TextBlock VerticalAlignment="Center"
615615
Text="{Binding DemoRestartCountdownText}"
616-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
616+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
617617
</Grid>
618618
</smtx:XamlDisplay>
619619

@@ -638,7 +638,7 @@
638638
Command="{Binding DismissCommand}"
639639
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
640640
Style="{StaticResource MaterialDesignFlatButton}"
641-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
641+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
642642
<StackPanel Orientation="Horizontal">
643643
<TextBlock Text="DISMISS" />
644644
<materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -647,7 +647,7 @@
647647

648648
<TextBlock VerticalAlignment="Center"
649649
Text="{Binding DemoRestartCountdownText}"
650-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
650+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
651651
</Grid>
652652
</smtx:XamlDisplay>
653653

‎src/MainDemo.Wpf/ColorTool.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@
481481
</UniformGrid>
482482

483483
<Grid DockPanel.Dock="Left">
484-
<Grid Visibility="{Binding IsChecked, ElementName=CustomPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
484+
<Grid Visibility="{Binding IsChecked, ElementName=CustomPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
485485
<Grid.ColumnDefinitions>
486486
<ColumnDefinition Width="160" />
487487
<ColumnDefinition />
@@ -501,7 +501,7 @@
501501
Color="{Binding SelectedColor, Delay=25}" />
502502
</Grid>
503503

504-
<StackPanel Visibility="{Binding IsChecked, ElementName=MdPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
504+
<StackPanel Visibility="{Binding IsChecked, ElementName=MdPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
505505
<StackPanel Orientation="Horizontal">
506506
<StackPanel.Resources>
507507
<Style TargetType="TextBlock">

‎src/MainDemo.Wpf/Fields.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259

260260
<TextBox VerticalAlignment="Top"
261261
materialDesign:HintAssist.Hint="This is a limited text area"
262-
materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignFilledTextBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}"
262+
materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignFilledTextBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
263263
MaxLength="40"
264264
Style="{StaticResource MaterialDesignFilledTextBox}"
265265
TextWrapping="Wrap" />
@@ -283,7 +283,7 @@
283283

284284
<PasswordBox materialDesign:HintAssist.HelperText="Helper text"
285285
materialDesign:HintAssist.Hint="Password"
286-
materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignFilledPasswordBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}"
286+
materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignFilledPasswordBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
287287
Style="{StaticResource MaterialDesignFilledPasswordBox}" />
288288
</StackPanel>
289289
</smtx:XamlDisplay>
@@ -356,7 +356,7 @@
356356
<TextBox Height="100"
357357
VerticalAlignment="Top"
358358
materialDesign:HintAssist.Hint="This is a limited text area"
359-
materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedTextBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}"
359+
materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedTextBoxTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
360360
MaxLength="40"
361361
Style="{StaticResource MaterialDesignOutlinedTextBox}"
362362
TextWrapping="Wrap"

‎src/MainDemo.Wpf/Pickers.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
HorizontalAlignment="Left"
230230
VerticalAlignment="Top"
231231
UniqueKey="pickers_15">
232-
<materialDesign:TimePicker ClockButtonVisibility="{Binding IsChecked, ElementName=IsClockButtonVisible, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}"
232+
<materialDesign:TimePicker ClockButtonVisibility="{Binding IsChecked, ElementName=IsClockButtonVisible, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
233233
Width="100"
234234
Is24Hours="True" />
235235
</smtx:XamlDisplay>

‎src/MainDemo.Wpf/SmartHint.xaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@
10361036
<Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
10371037
<Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
10381038
<Setter Property="MaxLength" Value="{Binding MaxLength}" />
1039-
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
1039+
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
10401040
</Style>
10411041
</Grid.Resources>
10421042
<Grid.ColumnDefinitions>
@@ -1096,7 +1096,7 @@
10961096
<Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
10971097
<Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
10981098
<Setter Property="MaxLength" Value="{Binding MaxLength}" />
1099-
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
1099+
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
11001100
</Style>
11011101
</Grid.Resources>
11021102
<Grid.ColumnDefinitions>
@@ -1157,7 +1157,7 @@
11571157
<Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
11581158
<Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
11591159
<Setter Property="MaxLength" Value="{Binding MaxLength}" />
1160-
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
1160+
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
11611161
</Style>
11621162
</Grid.Resources>
11631163
<Grid.ColumnDefinitions>
@@ -1227,7 +1227,7 @@
12271227
<Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
12281228
<Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
12291229
<Setter Property="MaxLength" Value="{Binding MaxLength}" />
1230-
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
1230+
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
12311231
</Style>
12321232
</Grid.Resources>
12331233
<Grid.ColumnDefinitions>
@@ -1288,7 +1288,7 @@
12881288
<Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
12891289
<Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
12901290
<Setter Property="MaxLength" Value="{Binding MaxLength}" />
1291-
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
1291+
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
12921292
</Style>
12931293
</Grid.Resources>
12941294
<Grid.ColumnDefinitions>
@@ -1350,7 +1350,7 @@
13501350
<Setter Property="materialDesign:TextFieldAssist.SuffixTextHintBehavior" Value="{Binding SelectedSuffixHintBehavior}" />
13511351
<Setter Property="materialDesign:TextFieldAssist.NewSpecHighlightingEnabled" Value="{Binding NewSpecHighlightingEnabled}" />
13521352
<Setter Property="MaxLength" Value="{Binding MaxLength}" />
1353-
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}" />
1353+
<Setter Property="materialDesign:TextFieldAssist.CharacterCounterVisibility" Value="{Binding ShowCharacterCounter, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}" />
13541354
</Style>
13551355
</Grid.Resources>
13561356
<Grid.ColumnDefinitions>

‎src/MaterialDesign3.Demo.Wpf/Buttons.xaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@
602602
Command="{Binding DismissCommand}"
603603
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
604604
Style="{StaticResource MaterialDesignRaisedButton}"
605-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
605+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
606606
<StackPanel Orientation="Horizontal">
607607
<TextBlock Text="DISMISS" />
608608
<materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -611,7 +611,7 @@
611611

612612
<TextBlock VerticalAlignment="Center"
613613
Text="{Binding DemoRestartCountdownText}"
614-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
614+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
615615
</Grid>
616616
</smtx:XamlDisplay>
617617

@@ -636,7 +636,7 @@
636636
Command="{Binding DismissCommand}"
637637
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
638638
Style="{StaticResource MaterialDesignOutlinedButton}"
639-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
639+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
640640
<StackPanel Orientation="Horizontal">
641641
<TextBlock Text="DISMISS" />
642642
<materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -645,7 +645,7 @@
645645

646646
<TextBlock VerticalAlignment="Center"
647647
Text="{Binding DemoRestartCountdownText}"
648-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
648+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
649649
</Grid>
650650
</smtx:XamlDisplay>
651651

@@ -670,7 +670,7 @@
670670
Command="{Binding DismissCommand}"
671671
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
672672
Style="{StaticResource MaterialDesignFlatButton}"
673-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
673+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
674674
<StackPanel Orientation="Horizontal">
675675
<TextBlock Text="DISMISS" />
676676
<materialDesign:PackIcon Margin="4,.5,0,0" Kind="Close" />
@@ -679,7 +679,7 @@
679679

680680
<TextBlock VerticalAlignment="Center"
681681
Text="{Binding DemoRestartCountdownText}"
682-
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.InverseInstance}}" />
682+
Visibility="{Binding ShowDismissButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.NotCollapsedInstance}}" />
683683
</Grid>
684684
</smtx:XamlDisplay>
685685

‎src/MaterialDesign3.Demo.Wpf/ColorTool.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@
480480
</UniformGrid>
481481

482482
<Grid DockPanel.Dock="Left">
483-
<Grid Visibility="{Binding IsChecked, ElementName=CustomPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
483+
<Grid Visibility="{Binding IsChecked, ElementName=CustomPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
484484
<Grid.ColumnDefinitions>
485485
<ColumnDefinition Width="160" />
486486
<ColumnDefinition />
@@ -501,7 +501,7 @@
501501
Color="{Binding SelectedColor, Delay=25}" />
502502
</Grid>
503503

504-
<StackPanel Visibility="{Binding IsChecked, ElementName=MdPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}">
504+
<StackPanel Visibility="{Binding IsChecked, ElementName=MdPaletteButton, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}">
505505
<StackPanel Orientation="Horizontal">
506506
<StackPanel.Resources>
507507
<Style TargetType="TextBlock">

‎src/MaterialDesign3.Demo.Wpf/Fields.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
<TextBox Height="100"
355355
VerticalAlignment="Top"
356356
materialDesign:HintAssist.Hint="This is a limited text area"
357-
materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedPasswordFieldTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.Instance}}"
357+
materialDesign:TextFieldAssist.CharacterCounterVisibility="{Binding Path=IsChecked, ElementName=MaterialDesignOutlinedPasswordFieldTextCountComboBox, Converter={x:Static materialDesignConverters:BooleanToVisibilityConverter.CollapsedInstance}}"
358358
MaxLength="40"
359359
Style="{StaticResource MaterialDesignOutlinedTextBox}"
360360
TextWrapping="Wrap"

0 commit comments

Comments
 (0)