Skip to content

Additional SmartHint refactoring #3181

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

Merged
Keboo merged 25 commits into from
May 11, 2023
Merged

Additional SmartHint refactoring #3181

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5923051
Initial work of respecting TextBox.Height - only done for TextBox so far
nicolaihenriksen Apr 25, 2023
ee18094
Aligning prefix/suffix texts
nicolaihenriksen Apr 27, 2023
860bcff
PasswordBox respects VerticalContentAlignment
nicolaihenriksen Apr 27, 2023
18d06d9
Fixes hint floating position for default offset
nicolaihenriksen May 1, 2023
539f009
DatePicker now respects VerticalContentAlignment
nicolaihenriksen May 1, 2023
0818e7b
TimePicker now respects VerticalContentAlignment
nicolaihenriksen May 1, 2023
c74f17f
Renamed element to match content
nicolaihenriksen May 1, 2023
31145a0
PasswordBox trailing icons/buttons now respect VerticalContentAlignment
nicolaihenriksen May 1, 2023
8c482ce
ComboBox clear button now respects VerticalContentAlignment
nicolaihenriksen May 1, 2023
00e4d34
ComboBox toggle button now respects VerticalContentAlignment
nicolaihenriksen May 1, 2023
bf2dedc
Improved 'Smart Hint' demo app page
nicolaihenriksen May 1, 2023
91f653c
Added FontSize to 'Smart Hint' demo app page
nicolaihenriksen May 1, 2023
2edf542
Change default VerticalContentAlignment of ComboBox to Center
nicolaihenriksen May 2, 2023
13dcc23
Apply red color to FontSize in 'Smart Hint' demo page
nicolaihenriksen May 2, 2023
9570007
Use FontFamily from "hint" as input to floating offset converter
nicolaihenriksen May 2, 2023
0580e60
Add support for controlling FontFamily in 'Smart Hint' demo page
nicolaihenriksen May 2, 2023
7b2a333
Add comment in demo app page regarding ShowMeTheXaml
nicolaihenriksen May 2, 2023
2d9e411
Fix typo
nicolaihenriksen May 2, 2023
5500491
Fix for broken UI tests for DatePicker and TimePicker
nicolaihenriksen May 2, 2023
884d312
Fix broken UI tests for PasswordBox
nicolaihenriksen May 2, 2023
91bd6a7
Apply same visibility fix for TextBox as was done to PasswordBox, etc.
nicolaihenriksen May 2, 2023
76d6f94
Align ComboBox prefix/suffix text margin and visibility with other ctrls
nicolaihenriksen May 2, 2023
b717ad5
Use HelperTextStyle in ComboBox, DatePicker, and TimePicker
nicolaihenriksen May 2, 2023
bef99f5
Set default VerticalContentAlignment=Center for Date- and TimePicker
nicolaihenriksen May 2, 2023
95d9075
Fixed failing unit tests for FloatingHintTransformConverter
nicolaihenriksen May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use HelperTextStyle in ComboBox, DatePicker, and TimePicker 
Also uses the helper text in the 'Smart Hint' demo app for a warning
  • Loading branch information
@nicolaihenriksen
nicolaihenriksen committed May 2, 2023
commit b717ad5bbf2cbccef132dcfaea45db156c4aeea3
11 changes: 8 additions & 3 deletions MainDemo.Wpf/SmartHint.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@
<TextBlock Text="{Binding Converter={StaticResource DoubleOptionToStringConverter}}" />
</DataTemplate>
<DataTemplate x:Key="FontSizeTemplate" DataType="{x:Type system:Double}">
<TextBlock Text="{Binding Converter={StaticResource DoubleOptionToStringConverter}}" Foreground="DarkRed" />
<TextBlock Text="{Binding Converter={StaticResource DoubleOptionToStringConverter}}" />
</DataTemplate>
<Style x:Key="FontSizeHelperTextStyle" TargetType="TextBlock" BasedOn="{StaticResource MaterialDesignHelperTextBlock}">
<Setter Property="Foreground" Value="DarkRed" />
</Style>

<local:PointOptionToStringConverter x:Key="FloatingOffsetOptionToStringConverter" DefaultValue="{x:Static domain:SmartHintViewModel.DefaultFloatingOffset}" />
<DataTemplate x:Key="FloatingOffsetTemplate">
Expand Down Expand Up @@ -102,8 +105,10 @@
<ComboBox VerticalAlignment="Center" Margin="5,0,0,0" ItemsSource="{Binding VerticalAlignmentOptions}" SelectedItem="{Binding SelectedVerticalAlignment, Mode=TwoWay}" />
<TextBox Text="{Binding PrefixText, UpdateSourceTrigger=PropertyChanged}" materialDesign:HintAssist.Hint="Prefix text" materialDesign:TextFieldAssist.HasClearButton="True" Margin="20,0,0,0" Width="50" MaxLength="3" />
<TextBox Text="{Binding SuffixText, UpdateSourceTrigger=PropertyChanged}" materialDesign:HintAssist.Hint="Suffix text" materialDesign:TextFieldAssist.HasClearButton="True" Margin="20,0,0,0" Width="50" MaxLength="3" />
<TextBlock Text="FontSize:" VerticalAlignment="Center" Margin="20,0,0,0" Foreground="DarkRed"/>
<ComboBox VerticalAlignment="Center" Margin="5,0,0,0" ItemsSource="{Binding FontSizeOptions}" SelectedItem="{Binding SelectedFontSize, Mode=TwoWay}" ItemTemplate="{StaticResource FontSizeTemplate}" />
<TextBlock Text="FontSize:" VerticalAlignment="Center" Margin="20,0,0,0" />
<ComboBox VerticalAlignment="Center" Margin="5,0,0,0" ItemsSource="{Binding FontSizeOptions}" SelectedItem="{Binding SelectedFontSize, Mode=TwoWay}" ItemTemplate="{StaticResource FontSizeTemplate}" Width="160"
materialDesign:HintAssist.HelperText="Currently only 'Default' is supported"
materialDesign:HintAssist.HelperTextStyle="{StaticResource FontSizeHelperTextStyle}"/>
</StackPanel>
</GroupBox>

Expand Down
3 changes: 2 additions & 1 deletion MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,8 @@
MaxWidth="{Binding ActualWidth, ElementName=toggleButton}"
FontSize="{TemplateBinding wpf:HintAssist.HelperTextFontSize}"
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
Text="{TemplateBinding wpf:HintAssist.HelperText}" />
Text="{TemplateBinding wpf:HintAssist.HelperText}"
Style="{Binding Path=(wpf:HintAssist.HelperTextStyle), RelativeSource={RelativeSource TemplatedParent}}"/>
</Canvas>
<wpf:ComboBoxPopup x:Name="PART_Popup"
Grid.Column="0"
Expand Down
4 changes: 3 additions & 1 deletion MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@
MaxWidth="{Binding ActualWidth, ElementName=border}"
FontSize="{TemplateBinding wpf:HintAssist.HelperTextFontSize}"
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
Text="{TemplateBinding wpf:HintAssist.HelperText}" />
Text="{TemplateBinding wpf:HintAssist.HelperText}"
Style="{Binding Path=(wpf:HintAssist.HelperTextStyle), RelativeSource={RelativeSource TemplatedParent}}"/>
</Canvas>
</Grid>
<ControlTemplate.Triggers>
Expand Down Expand Up @@ -509,6 +510,7 @@
wpf:HintAssist.Foreground="{TemplateBinding wpf:HintAssist.Foreground}"
wpf:HintAssist.HelperText="{TemplateBinding wpf:HintAssist.HelperText}"
wpf:HintAssist.HelperTextFontSize="{TemplateBinding wpf:HintAssist.HelperTextFontSize}"
wpf:HintAssist.HelperTextStyle="{TemplateBinding wpf:HintAssist.HelperTextStyle}"
wpf:HintAssist.Hint="{TemplateBinding wpf:HintAssist.Hint}"
wpf:HintAssist.HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
wpf:HintAssist.IsFloating="{TemplateBinding wpf:HintAssist.IsFloating}"
Expand Down
4 changes: 3 additions & 1 deletion MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,8 @@
MaxWidth="{Binding ActualWidth, ElementName=border}"
FontSize="{TemplateBinding wpf:HintAssist.HelperTextFontSize}"
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
Text="{TemplateBinding wpf:HintAssist.HelperText}" />
Text="{TemplateBinding wpf:HintAssist.HelperText}"
Style="{Binding Path=(wpf:HintAssist.HelperTextStyle), RelativeSource={RelativeSource TemplatedParent}}"/>
</Canvas>
</Grid>
<ControlTemplate.Triggers>
Expand Down Expand Up @@ -521,6 +522,7 @@
wpf:HintAssist.Foreground="{TemplateBinding wpf:HintAssist.Foreground}"
wpf:HintAssist.HelperText="{TemplateBinding wpf:HintAssist.HelperText}"
wpf:HintAssist.HelperTextFontSize="{TemplateBinding wpf:HintAssist.HelperTextFontSize}"
wpf:HintAssist.HelperTextStyle="{TemplateBinding wpf:HintAssist.HelperTextStyle}"
wpf:HintAssist.Hint="{TemplateBinding wpf:HintAssist.Hint}"
wpf:HintAssist.HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
wpf:HintAssist.IsFloating="{TemplateBinding wpf:HintAssist.IsFloating}"
Expand Down