Skip to content

Fix #2633 - HelperText margin and padding #2648

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 6 commits into from
Apr 16, 2022
Merged

Fix #2633 - HelperText margin and padding #2648

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1361af
Transparent header menu
ElieTaillard Mar 2, 2022
6bde5a4
Filling the available height with menu headers + additional menu exam…
ElieTaillard Mar 2, 2022
93162ca
Merge branch 'master' of https://github.com/Xaalek/MaterialDesignInXa…
ElieTaillard Mar 24, 2022
1c55a97
Merge branch 'master' of https://github.com/Xaalek/MaterialDesignInXa…
ElieTaillard Apr 1, 2022
eca7a83
Fix HelperText padding and margin on :
ElieTaillard Apr 1, 2022
6b8e78e
set TextFieldAssist.HasFilledTextField to true in MaterialDesignFille…
ElieTaillard Apr 15, 2022
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
set TextFieldAssist.HasFilledTextField to true in MaterialDesignFille… 
…dComboBox style
  • Loading branch information
@ElieTaillard
ElieTaillard committed Apr 15, 2022
commit 6b8e78e3864e432a8fe88b83a4e89421831438f8
5 changes: 5 additions & 0 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,10 @@
</Grid>
</AdornerDecorator>
<ControlTemplate.Triggers>
<Trigger Property="wpf:TextFieldAssist.HasFilledTextField" Value="True">
<Setter Property="Padding" Value="16 8 12 8" />
<Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
</Trigger>
<Trigger
Property="wpf:TextFieldAssist.HasOutlinedTextField"
Value="True">
Expand Down Expand Up @@ -1362,6 +1366,7 @@
</Style>

<Style x:Key="MaterialDesignFilledComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource MaterialDesignFloatingHintComboBox}">
<Setter Property="wpf:TextFieldAssist.HasFilledTextField" Value="True"/>
<Setter Property="wpf:TextFieldAssist.TextFieldCornerRadius" Value="4,4,0,0" />
<Setter Property="wpf:ComboBoxAssist.ShowSelectedItem" Value="True"/>
<Setter Property="VerticalContentAlignment" Value="Stretch" />
Expand Down