Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
3af9076
Initial TextBox style changes added
nicolaihenriksen Mar 8, 2024
5583933
Temporarily fix AutoSuggestBox by bringing in old converters directly…
nicolaihenriksen Mar 8, 2024
23a613b
Add character counter toggle to demo app
nicolaihenriksen Mar 8, 2024
b7bb541
Basics of SmartHint refactor in place - edge cases need attention
nicolaihenriksen Mar 8, 2024
e1c40fa
Fix "padding" issues for outlined style by letting the padding animat…
nicolaihenriksen Mar 8, 2024
56d82b1
Fix AcceptsReturn=True scenario for TextBox use of SmartHint
nicolaihenriksen Mar 8, 2024
2e7be56
Smart hint page in demo app handles its own scrolling
nicolaihenriksen Mar 8, 2024
f5cd136
Improve handling of dynamic FontSize changes
nicolaihenriksen Mar 8, 2024
a4cb453
Add TextFieldAssist.IconVerticalAlignment AP to control icon placemen…
nicolaihenriksen Mar 8, 2024
8b76a7e
Add APs for controlling prefix/suffix visibility and floating hint al…
nicolaihenriksen Mar 8, 2024
c2cf3ca
DP cleanup
nicolaihenriksen Mar 8, 2024
8c2d0e3
Smart Hint demo app page cleanup
nicolaihenriksen Mar 8, 2024
bd4462b
Let hint span accross prefix/suffix texts
nicolaihenriksen Mar 8, 2024
c1c9ca9
Update demo app Smart Hint page with selectors for new APs
nicolaihenriksen Mar 8, 2024
2da8e16
Make prefix/suffix visibility converter respect new AP
nicolaihenriksen Mar 8, 2024
854f8dc
Decent working state; special cases where hint should also animate ho…
nicolaihenriksen Mar 8, 2024
62bbf85
Fix horizontal animation of hint cases
nicolaihenriksen Mar 8, 2024
4f1ce92
Mark converters for obsoletion/deletion
nicolaihenriksen Mar 8, 2024
aa01197
Remove no longer used converter
nicolaihenriksen Mar 8, 2024
80c748d
Move SmartHint converters into their own files
nicolaihenriksen Mar 8, 2024
9a57421
Temporarily change startup page to SmartHint
nicolaihenriksen Mar 8, 2024
2f94000
Fix FloatingHintInitialHorizontalOffsetConverter logic
nicolaihenriksen Mar 9, 2024
1c75566
Update MainDemo.Wpf/SmartHint.xaml
nicolaihenriksen Mar 11, 2024
6150e10
Update MainDemo.Wpf/SmartHint.xaml
nicolaihenriksen Mar 11, 2024
ed81317
Update MainDemo.Wpf/SmartHint.xaml
nicolaihenriksen Mar 11, 2024
9b8b71e
Update MainDemo.Wpf/SmartHint.xaml
nicolaihenriksen Mar 11, 2024
23e304f
Update MainDemo.Wpf/SmartHint.xaml
nicolaihenriksen Mar 11, 2024
2c3e6e5
Update MaterialDesignThemes.Wpf/Converters/FloatingHintMarginConverte…
nicolaihenriksen Mar 11, 2024
7af4211
Renamed converter values
nicolaihenriksen Mar 11, 2024
d93e345
Update MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.…
nicolaihenriksen Mar 11, 2024
1bca5eb
Implement BooleanToDashStyleConverter.ConvertBack()
nicolaihenriksen Mar 11, 2024
d522441
Remove dead code
nicolaihenriksen Mar 11, 2024
7607392
Handle HasErrors=True margin correction
nicolaihenriksen Mar 11, 2024
2f17f44
Fix support for TextFieldAssist.NewSpecHighlightingEnabled=True
nicolaihenriksen Mar 11, 2024
98b16f2
Add TextFieldAssist.NewSpecHighlightingEnabled support on demo app Sm…
nicolaihenriksen Mar 11, 2024
4c79c00
Add options to control scroll bar visibility on SmartHint demo page (…
nicolaihenriksen Mar 13, 2024
5833970
Slightly nicer layout for scroll bar options on SmartHint demo page
nicolaihenriksen Mar 13, 2024
cf2cd7a
Fix "accepts return" check box to use VM binding
nicolaihenriksen Mar 13, 2024
96ef473
Temporarily add defaults to showcase the horizontal scrollbar issue
nicolaihenriksen Mar 13, 2024
8f4fc67
Include RD for missing static resource
nicolaihenriksen Mar 18, 2024
d317d22
PoC fix for the VerticalContentAlignment=Stretch issue
nicolaihenriksen Mar 18, 2024
6b1ce17
Fix demo app layout and defaults after rebase
nicolaihenriksen Mar 28, 2024
c5f6e5b
Leverage list pattern matching in relevant converters
nicolaihenriksen Mar 28, 2024
344dc1a
Cleanup constants and "hide" temporary constants in an internal class.
nicolaihenriksen Mar 28, 2024
e11a573
Fix for TextBoxTests.FilledTextBox_ValidationErrorMargin_MatchesHelpe…
nicolaihenriksen Mar 28, 2024
785f69c
Fix for TextBoxTests.HelperText_CanSetFontColorWithAttachedStyle()
nicolaihenriksen Mar 28, 2024
cfc8b76
Fix for TextBoxTests.OnClearButtonShown_ControlHeightDoesNotChange()
nicolaihenriksen Mar 28, 2024
0c722f2
Deleted TextBoxTests.OnOutlinedTextBox_FloatingHintOffsetWithinRange(…
nicolaihenriksen Mar 28, 2024
2795619
Fix for TextBoxTests.OnTextBoxDisabled_FloatingHintBackgroundIsOpaque()
nicolaihenriksen Mar 28, 2024
63de7b4
Fix for TextBoxTests.OutlinedTextBox_ValidationErrorMargin_MatchesHel…
nicolaihenriksen Mar 28, 2024
9f9c924
Fix for TextBoxTests.TextBox_MultiLineAndFixedHeight_RespectsVertical…
nicolaihenriksen Mar 28, 2024
5de85bd
Adjust default paddings to for better looks, and temporary make the U…
nicolaihenriksen Mar 30, 2024
0180b65
Merge duplicate triggers
nicolaihenriksen Apr 3, 2024
800f3bc
Add dedicated "MaterialDesign.Brush.TextBox.HoverBorder" brush
nicolaihenriksen Apr 3, 2024
d6462d8
Use new hover brush for the filled TextBox style
nicolaihenriksen Apr 3, 2024
f289bf7
Minor code cleanup
Keboo Apr 4, 2024
932656a
New brush is now an alternate rather than an obsolete brush
nicolaihenriksen Apr 5, 2024
db948d1
Fix issue with HintAssist.IsFloating wrongfully affecting the hint te…
nicolaihenriksen Apr 5, 2024
94e5677
Cherry-pick FloatingHintMarginConverter from ComboBox branch
nicolaihenriksen Apr 5, 2024
1485de4
Add additional binding to use of FloatingHintMarginConverter
nicolaihenriksen Apr 5, 2024
691074d
Add IsEditable parameter to prefix/suffix converter (taken from Combo…
nicolaihenriksen Apr 5, 2024
f5f4fe8
Split failing default height tests into pre- and post-smarthint-refactor
nicolaihenriksen Apr 6, 2024
1d758ce
Fix jumpy UI when validation errors and color hint text red
nicolaihenriksen Apr 6, 2024
9d21ca1
Set MinHeight=16 and separate all tests into pre-/post-refactor
nicolaihenriksen Apr 7, 2024
9a7db19
Remove MaxWidth from demo app page
nicolaihenriksen Apr 7, 2024
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
Smart Hint demo app page cleanup
  • Loading branch information
nicolaihenriksen committed Mar 28, 2024
commit 8c2d0e3825bcc37ce57e5098d0ee2d27e5d2a3e4
4 changes: 2 additions & 2 deletions MainDemo.Wpf/Domain/SmartHintViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ internal class SmartHintViewModel : ViewModelBase
private double _selectedLeadingIconSize = 20;
private double _selectedTrailingIconSize = 20;
private VerticalAlignment _selectedIconVerticalAlignment = VerticalAlignment.Center;
private string? _prefixText;
private string? _suffixText;
private string? _prefixText = "pre";
private string? _suffixText = "pos";
private double _selectedFontSize = double.NaN;
private FontFamily? _selectedFontFamily = DefaultFontFamily;
private bool _controlsEnabled = true;
Expand Down
11 changes: 2 additions & 9 deletions MainDemo.Wpf/SmartHint.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@
<DataTemplate x:Key="FontSizeTemplate" DataType="{x:Type system:Double}">
<TextBlock Text="{Binding Converter={StaticResource DoubleOptionToStringConverter}}" />
</DataTemplate>
<Style x:Key="FontSizeHelperTextStyle"
TargetType="TextBlock">
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignValidationErrorBrush}" />
</Style>

<local:PointOptionToStringConverter x:Key="FloatingOffsetOptionToStringConverter" DefaultValue="{x:Static domain:SmartHintViewModel.DefaultFloatingOffset}" />
<DataTemplate x:Key="FloatingOffsetTemplate">
Expand Down Expand Up @@ -211,13 +207,13 @@
SelectedItem="{Binding SelectedVerticalAlignment, Mode=TwoWay}" />
<TextBox Width="50"
Margin="20,0,0,0"
materialDesign:HintAssist.Hint="Prefix text"
materialDesign:HintAssist.Hint="Prefix"
materialDesign:TextFieldAssist.HasClearButton="True"
MaxLength="3"
Text="{Binding PrefixText, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Width="50"
Margin="20,0,0,0"
materialDesign:HintAssist.Hint="Suffix text"
materialDesign:HintAssist.Hint="Suffix"
materialDesign:TextFieldAssist.HasClearButton="True"
MaxLength="3"
Text="{Binding SuffixText, UpdateSourceTrigger=PropertyChanged}" />
Expand All @@ -227,9 +223,6 @@
<ComboBox Width="160"
Margin="5,0,0,0"
VerticalAlignment="Center"
materialDesign:HintAssist.HelperText="Currently only 'Default' is supported"
materialDesign:HintAssist.HelperTextStyle="{StaticResource FontSizeHelperTextStyle}"
materialDesign:HintAssist.HintOpacity="1"
ItemTemplate="{StaticResource FontSizeTemplate}"
ItemsSource="{Binding FontSizeOptions}"
SelectedItem="{Binding SelectedFontSize, Mode=TwoWay}" />
Expand Down