Skip to content

Add AP to control SmartHint resting position #3502

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 4 commits into from
Mar 28, 2024
Merged

Add AP to control SmartHint resting position #3502

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28b5bc1
Add attached property for the "resting" hint location override
nicolaihenriksen Mar 25, 2024
1fd4ac9
Update demo app SmartHint page to control the new AP
nicolaihenriksen Mar 25, 2024
0316054
Use new AP in calculation of the hint placement
nicolaihenriksen Mar 25, 2024
1f39688
Rename variable for better code clarity
nicolaihenriksen Mar 25, 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
Update demo app SmartHint page to control the new AP
  • Loading branch information
@nicolaihenriksen
nicolaihenriksen committed Mar 25, 2024
commit 1fd4ac94e09637672cb909e0960df4f467f1b4ba
7 changes: 7 additions & 0 deletions MainDemo.Wpf/Domain/SmartHintViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ internal class SmartHintViewModel : ViewModelBase

private bool _floatHint = true;
private FloatingHintHorizontalAlignment _selectedAlignment = FloatingHintHorizontalAlignment.Inherit;
private FloatingHintHorizontalAlignment _selectedFloatingAlignment = FloatingHintHorizontalAlignment.Inherit;
private double _selectedFloatingScale = 0.75;
private bool _showClearButton = true;
private bool _showLeadingIcon = true;
Expand Down Expand Up @@ -55,6 +56,12 @@ public FloatingHintHorizontalAlignment SelectedAlignment
set => SetProperty(ref _selectedAlignment, value);
}

public FloatingHintHorizontalAlignment SelectedFloatingAlignment
{
get => _selectedFloatingAlignment;
set => SetProperty(ref _selectedFloatingAlignment, value);
}

public double SelectedFloatingScale
{
get => _selectedFloatingScale;
Expand Down
18 changes: 13 additions & 5 deletions MainDemo.Wpf/SmartHint.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
<Style TargetType="{x:Type local:InputElementContentControl}">
<Setter Property="Margin" Value="10,10,10,16" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="materialDesign:HintAssist.FloatingHintHorizontalAlignment" Value="{Binding SelectedAlignment}" />
<Setter Property="materialDesign:HintAssist.HintHorizontalAlignment" Value="{Binding SelectedAlignment}" />
<Setter Property="materialDesign:HintAssist.FloatingHintHorizontalAlignment" Value="{Binding SelectedFloatingAlignment}" />
<Setter Property="materialDesign:HintAssist.FloatingOffset" Value="{Binding SelectedFloatingOffset}" />
<Setter Property="materialDesign:HintAssist.FloatingScale" Value="{Binding SelectedFloatingScale}" />
<Setter Property="materialDesign:HintAssist.HelperText" Value="{Binding HelperText}" />
Expand Down Expand Up @@ -75,30 +76,37 @@
<StackPanel Orientation="Vertical">
<StackPanel Margin="10" Orientation="Horizontal">
<CheckBox Content="IsFloating" IsChecked="{Binding FloatHint}" />
<TextBlock Margin="20,0,0,0"
<TextBlock Margin="15,0,0,0"
VerticalAlignment="Center"
Text="Alignment:" />
<ComboBox Margin="5,0,0,0"
VerticalAlignment="Center"
ItemsSource="{Binding HorizontalAlignmentOptions}"
SelectedItem="{Binding SelectedAlignment, Mode=TwoWay}" />
<TextBlock Margin="20,0,0,0"
<TextBlock Margin="15,0,0,0"
VerticalAlignment="Center"
Text="FloatingAlignment:" />
<ComboBox Margin="5,0,0,0"
VerticalAlignment="Center"
ItemsSource="{Binding HorizontalAlignmentOptions}"
SelectedItem="{Binding SelectedFloatingAlignment, Mode=TwoWay}" />
<TextBlock Margin="15,0,0,0"
VerticalAlignment="Center"
Text="FloatingScale:" />
<ComboBox Margin="5,0,0,0"
VerticalAlignment="Center"
ItemStringFormat="F2"
ItemsSource="{Binding FloatingScaleOptions}"
SelectedItem="{Binding SelectedFloatingScale, Mode=TwoWay}" />
<TextBlock Margin="20,0,0,0"
<TextBlock Margin="15,0,0,0"
VerticalAlignment="Center"
Text="FloatingOffset:" />
<ComboBox Margin="5,0,0,0"
VerticalAlignment="Center"
ItemTemplate="{StaticResource FloatingOffsetTemplate}"
ItemsSource="{Binding FloatingOffsetOptions}"
SelectedItem="{Binding SelectedFloatingOffset, Mode=TwoWay}" />
<CheckBox Margin="20,0,0,0"
<CheckBox Margin="15,0,0,0"
Content="HasClearButton"
IsChecked="{Binding ShowClearButton}" />
<CheckBox Margin="20,0,0,0"
Expand Down