Skip to content

Commit 30b9c4f

Browse files
KebooKeboo
committed
Fix AutoSuggestBox as well
1 parent 31e3840 commit 30b9c4f

File tree

1 file changed

+52
-53
lines changed

1 file changed

+52
-53
lines changed

‎src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml‎

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -71,29 +71,29 @@
7171
</VisualStateGroup>
7272
</VisualStateManager.VisualStateGroups>
7373
<Border HorizontalAlignment="Stretch"
74-
VerticalAlignment="Stretch"
75-
Background="{DynamicResource MaterialDesign.Brush.TextBox.HoverBackground}"
76-
CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
77-
RenderTransformOrigin="0.5,0.5"
78-
Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
74+
VerticalAlignment="Stretch"
75+
Background="{DynamicResource MaterialDesign.Brush.TextBox.HoverBackground}"
76+
CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
77+
RenderTransformOrigin="0.5,0.5"
78+
Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}">
7979
<Border.RenderTransform>
8080
<ScaleTransform x:Name="RippleOnFocusScaleTransform" ScaleX="0" ScaleY="0" />
8181
</Border.RenderTransform>
8282
</Border>
8383
<AdornerDecorator>
8484
<Border x:Name="OuterBorder"
85-
Padding="{TemplateBinding Padding}"
86-
wpf:BottomDashedLineAdorner.Brush="{TemplateBinding BorderBrush}"
87-
wpf:BottomDashedLineAdorner.Thickness="{Binding RelativeSource={RelativeSource Self}, Path=BorderThickness}"
88-
Background="{TemplateBinding Background}"
89-
BorderBrush="{TemplateBinding BorderBrush}"
90-
BorderThickness="{TemplateBinding BorderThickness}"
91-
CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
92-
SnapsToDevicePixels="True">
85+
Padding="{TemplateBinding Padding}"
86+
wpf:BottomDashedLineAdorner.Brush="{TemplateBinding BorderBrush}"
87+
wpf:BottomDashedLineAdorner.Thickness="{Binding RelativeSource={RelativeSource Self}, Path=BorderThickness}"
88+
Background="{TemplateBinding Background}"
89+
BorderBrush="{TemplateBinding BorderBrush}"
90+
BorderThickness="{TemplateBinding BorderThickness}"
91+
CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
92+
SnapsToDevicePixels="True">
9393

9494
<Grid x:Name="ContentGrid"
95-
MinHeight="16"
96-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
95+
MinHeight="16"
96+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
9797
<Grid.ColumnDefinitions>
9898
<ColumnDefinition Width="Auto" />
9999
<ColumnDefinition Width="Auto" />
@@ -104,32 +104,14 @@
104104
</Grid.ColumnDefinitions>
105105

106106
<wpf:PackIcon x:Name="LeadingPackIcon"
107-
Grid.Column="0"
108-
Width="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
109-
Height="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
110-
Margin="0,0,6,0"
111-
VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
112-
Kind="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
113-
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
114-
Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
115-
116-
<TextBlock x:Name="PrefixTextBlock"
117-
Grid.Column="1"
118-
Margin="0,0,2,0"
119-
VerticalAlignment="Center"
120-
FontSize="{TemplateBinding FontSize}"
121-
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
122-
Text="{TemplateBinding wpf:TextFieldAssist.PrefixText}">
123-
<TextBlock.Visibility>
124-
<MultiBinding Converter="{StaticResource PrefixSuffixTextVisibilityConverter}">
125-
<Binding ElementName="Hint" Path="IsHintInFloatingPosition" />
126-
<Binding Path="(wpf:TextFieldAssist.PrefixText)" RelativeSource="{RelativeSource TemplatedParent}" />
127-
<Binding Path="(wpf:TextFieldAssist.PrefixTextVisibility)" RelativeSource="{RelativeSource TemplatedParent}" />
128-
<Binding Path="IsKeyboardFocusWithin" RelativeSource="{RelativeSource TemplatedParent}" />
129-
<Binding Path="IsReadOnly" RelativeSource="{RelativeSource TemplatedParent}" Converter="{x:Static converters:InvertBooleanConverter.Instance}" />
130-
</MultiBinding>
131-
</TextBlock.Visibility>
132-
</TextBlock>
107+
Grid.Column="0"
108+
Width="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
109+
Height="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
110+
Margin="0,0,6,0"
111+
VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
112+
Kind="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
113+
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
114+
Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
133115

134116
<ScrollViewer x:Name="PART_ContentHost"
135117
Grid.Column="2"
@@ -192,20 +174,38 @@
192174
</wpf:SmartHint.Margin>
193175
<wpf:SmartHint.Hint>
194176
<Border x:Name="HintBackgroundBorder"
195-
Background="{TemplateBinding wpf:HintAssist.Background}"
196-
CornerRadius="2">
177+
Background="{TemplateBinding wpf:HintAssist.Background}"
178+
CornerRadius="2">
197179
<ContentPresenter x:Name="HintWrapper" Content="{TemplateBinding wpf:HintAssist.Hint}" />
198180
</Border>
199181
</wpf:SmartHint.Hint>
200182
</wpf:SmartHint>
201183

184+
<TextBlock x:Name="PrefixTextBlock"
185+
Grid.Column="1"
186+
Margin="0,0,2,0"
187+
VerticalAlignment="Center"
188+
FontSize="{TemplateBinding FontSize}"
189+
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
190+
Text="{TemplateBinding wpf:TextFieldAssist.PrefixText}">
191+
<TextBlock.Visibility>
192+
<MultiBinding Converter="{StaticResource PrefixSuffixTextVisibilityConverter}">
193+
<Binding ElementName="Hint" Path="IsHintInFloatingPosition" />
194+
<Binding Path="(wpf:TextFieldAssist.PrefixText)" RelativeSource="{RelativeSource TemplatedParent}" />
195+
<Binding Path="(wpf:TextFieldAssist.PrefixTextVisibility)" RelativeSource="{RelativeSource TemplatedParent}" />
196+
<Binding Path="IsKeyboardFocusWithin" RelativeSource="{RelativeSource TemplatedParent}" />
197+
<Binding Path="IsReadOnly" RelativeSource="{RelativeSource TemplatedParent}" Converter="{x:Static converters:InvertBooleanConverter.Instance}" />
198+
</MultiBinding>
199+
</TextBlock.Visibility>
200+
</TextBlock>
201+
202202
<TextBlock x:Name="SuffixTextBlock"
203-
Grid.Column="3"
204-
Margin="2,0,0,0"
205-
VerticalAlignment="Center"
206-
FontSize="{TemplateBinding FontSize}"
207-
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
208-
Text="{TemplateBinding wpf:TextFieldAssist.SuffixText}">
203+
Grid.Column="3"
204+
Margin="2,0,0,0"
205+
VerticalAlignment="Center"
206+
FontSize="{TemplateBinding FontSize}"
207+
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
208+
Text="{TemplateBinding wpf:TextFieldAssist.SuffixText}">
209209
<TextBlock.Visibility>
210210
<MultiBinding Converter="{StaticResource PrefixSuffixTextVisibilityConverter}">
211211
<Binding ElementName="Hint" Path="IsHintInFloatingPosition" />
@@ -289,11 +289,10 @@
289289
CornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
290290
Visibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}" />
291291

292-
<Canvas VerticalAlignment="Bottom"
293-
IsHitTestVisible="False">
292+
<Canvas VerticalAlignment="Bottom" IsHitTestVisible="False">
294293
<Border Canvas.Top="2"
295-
Padding="{TemplateBinding Padding, Converter={StaticResource HelperTextMarginConverter}}"
296-
Width="{Binding ActualWidth, ElementName=OuterBorder}">
294+
Padding="{TemplateBinding Padding, Converter={StaticResource HelperTextMarginConverter}}"
295+
Width="{Binding ActualWidth, ElementName=OuterBorder}">
297296
<Grid x:Name="FooterGrid">
298297
<Grid.ColumnDefinitions>
299298
<ColumnDefinition />

0 commit comments

Comments
 (0)